X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=43ce921475cf9971b3ff518f48cf6d5425aedf14;hb=d2333df8c914009f3ebdcc5e11402e6edccc924e;hp=b4eb8faacdbdb52d5d4786fe8495c747762c1c6a;hpb=0d0b5fcbaf3e8eb1cbfd9764d19792c4383cce7b;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index b4eb8fa..43ce921 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -385,7 +385,8 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
-	clock.tick(dt);
+	if(!driver || !driver->is_halted())
+		clock.tick(dt);
 
 	for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
 		(*i)->tick(dt);
@@ -396,12 +397,15 @@ void Layout::tick()
 		i->second->tick(dt);
 }
 
-void Layout::emergency(const string &msg)
+void Layout::emergency(Block *block, const string &msg)
 {
 	if(driver)
 		driver->halt(true);
-	IO::print("Emergency: %s\n", msg);
-	signal_emergency.emit(msg);
+	if(block)
+		IO::print("Emergency at %s: %s\n", block->get_name(), msg);
+	else
+		IO::print("Emergency: %s\n", msg);
+	signal_emergency.emit(block, msg);
 }
 
 void Layout::save(const string &fn) const
@@ -500,7 +504,7 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 	{
 		Block *block = sensor.get_block();
 		if(block && !block->get_train())
-			emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+			emergency(block, "Unreserved sensor triggered");
 	}
 }