X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=82dde18fdf9ccf76512576dc5157517f480ffd79;hb=3fce1269879f4b4d676f249f91efd69286a606fd;hp=97a91e23ad2af63081f85b0aa7c62324e196fa29;hpb=e392d397f6b86a49a05e9738357ccbfc2a922f01;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 97a91e2..82dde18 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -121,10 +121,12 @@ void Catalogue::Loader::track(unsigned art_nr)
 
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
+	if(obj.tracks.count(art_nr))
+		throw KeyError("Duplicate track type", art_nr.str());
+
 	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	obj.add_track(*trk);
-	trk.release();
+	obj.add_track(*trk.release());
 }
 
 void Catalogue::Loader::vehicle(unsigned art_nr)
@@ -134,10 +136,12 @@ void Catalogue::Loader::vehicle(unsigned art_nr)
 
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
+	if(obj.vehicles.count(art_nr))
+		throw KeyError("Duplicate vehicle type", art_nr.str());
+
 	RefPtr<VehicleType> veh = new VehicleType(art_nr);
 	load_sub(*veh);
-	obj.add_vehicle(*veh);
-	veh.release();
+	obj.add_vehicle(*veh.release());
 }
 
 } // namespace Marklin