From 684cf3b8c41e9bb60b2d286bd6d632b0c5abf0ab Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 13 Dec 2009 15:05:35 +0000 Subject: [PATCH] Prevent a crash if a layout file contains empty routes Add missing forward declaration to train.h --- source/libmarklin/layout.cpp | 3 +++ source/libmarklin/train.h | 1 + 2 files changed, 4 insertions(+) diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp index 3a6b630..121e19e 100644 --- a/source/libmarklin/layout.cpp +++ b/source/libmarklin/layout.cpp @@ -120,6 +120,9 @@ void Layout::check_routes() } } + if(!track) + continue; + (*i)->add_track(*track); const vector &eps = track->get_type().get_endpoints(); diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h index d4c7e18..b891a66 100644 --- a/source/libmarklin/train.h +++ b/source/libmarklin/train.h @@ -18,6 +18,7 @@ namespace Marklin { class Locomotive; class Sensor; class TrafficManager; +class Turnout; class Train: public sigc::trackable { -- 2.45.2