X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.cpp;h=a6e3f2d171739734e3a412cfb6ac9ec4436689a3;hb=52cbe8d99669f843f8f75c51128e2748584dd03a;hp=eca9ae2f90ee6eca92a7f60c4346ca57a024af3a;hpb=36beacc579d3132642ed4d98ce5a6d99842b5812;p=r2c2.git

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index eca9ae2..a6e3f2d 100644
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -15,7 +15,7 @@ Turnout::Turnout(Control &c, unsigned a):
 	addr(a),
 	route(0)
 {
-	control.add_turnout(this);
+	control.add_turnout(*this);
 
 	control.signal_turnout_event.connect(sigc::mem_fun(this, &Turnout::turnout_event));
 
@@ -31,7 +31,7 @@ void Turnout::set_route(unsigned r)
 	route=r;
 
 	command(true);
-	(new Time::Timer(200*Time::msec))->signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
+	control.set_timer(200*Time::msec).signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
 
 	signal_route_changed.emit(route);
 }