X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=867e0a8d32c1e49c02f6cf1b61e59e9936bdf40e;hb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;hp=e574925f259628e7846a692a34ee9dd29069e12b;hpb=975ea87cc7be179618b06291cb2506a2523cad1f;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index e574925..867e0a8 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,22 +1,15 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "libmarklin/driver.h"
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "trainproperties.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
 TrainProperties::TrainProperties(Engineer &e, Train *t):
 	engineer(e),
@@ -151,7 +144,7 @@ void TrainProperties::remove_vehicle_clicked()
 
 	lst_vehicles->remove(selected);
 
-	unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size();
+	unsigned n_vehicles = (train ? train->get_n_vehicles()-rem_vehicles.size() : 0);
 	if(static_cast<unsigned>(selected)>=n_vehicles)
 		add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles));
 	else