Prevent a crash if a layout file contains empty routes

Add missing forward declaration to train.h

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 3a6b6302d56ebf806c442ce8f8c808fb903a5091..121e19e937a1366ec1c4afd259a36943f522edd1 100644 (file)
--- 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<Endpoint> &eps = track->get_type().get_endpoints();

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index d4c7e186acd24b251d14e5680bcee5d7a8ca65e8..b891a660ac4e8ca381947421a7bc73c3c6b4397d 100644 (file)
--- 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
 {