X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=68533bc11520114862acfed734c50cd07c91010b;hb=a44355019e5a27da0d5e5287aae74864e4122e1f;hp=fc93cf66b6076555a76129c745b1900f6dd78eff;hpb=b86f4adf319881697e6ecb46aaeaffe01d7b0a0a;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index fc93cf6..68533bc 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -314,10 +314,13 @@ Object *Engineer::pick_object(const Vector &p)
 void Engineer::emergency(Block *block, const string &msg)
 {
 	set_status(msg);
-	TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
-	tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
-	tch3d->set_layer(2);
-	emergencies.push_back(tch3d);
+	if(block)
+	{
+		TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
+		tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+		tch3d->set_layer(2);
+		emergencies.push_back(tch3d);
+	}
 }
 
 void Engineer::halt_event(bool h)