X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=1df37d3d3ea6b742dfb75e7f893a1d7056426fa0;hb=61e10c1c177aa8867aa6e7c412899e917400ac2d;hp=3a6b6302d56ebf806c442ce8f8c808fb903a5091;hpb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;p=r2c2.git

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 3a6b630..1df37d3 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -45,6 +45,14 @@ void Layout::add_route(Route &r)
 		signal_route_added.emit(r);
 }
 
+Route &Layout::get_route(const string &name) const
+{
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if((*i)->get_name()==name)
+			return **i;
+	throw KeyError("Unknown route", name);
+}
+
 void Layout::remove_route(Route &r)
 {
 	if(routes.erase(&r))
@@ -120,6 +128,9 @@ void Layout::check_routes()
 			}
 		}
 
+		if(!track)
+			continue;
+
 		(*i)->add_track(*track);
 
 		const vector<Endpoint> &eps = track->get_type().get_endpoints();
@@ -134,9 +145,7 @@ void Layout::check_routes()
 		Track *start = track;
 		while(1)
 		{
-			int out_ep = track->traverse(ep, trk_path);
-			if(out_ep<0)
-				break;
+			unsigned out_ep = track->traverse(ep, trk_path);
 			Track *next = track->get_links()[out_ep];
 			if(!next || next == start)
 				break;