From eefe244e276634d59d5e6b89217f5747bb2afd97 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <mana@crushnet.org>
Date: Thu, 4 Mar 2010 22:09:44 +0100
Subject: Fixed crash when a map-based particle effect can't be loaded

---
 src/map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/map.cpp')

diff --git a/src/map.cpp b/src/map.cpp
index 24b3e84b..b1bd634b 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -802,7 +802,7 @@ void Map::initializeParticleEffects(Particle *particleEngine)
             )
         {
             p = particleEngine->addEffect(i->file, i->x, i->y);
-            if (i->w > 0 && i->h > 0)
+            if (p && i->w > 0 && i->h > 0)
             {
                 p->adjustEmitterSize(i->w, i->h);
             }
-- 
cgit v1.2.3-60-g2f50