mockingbirdnest · Mar 22, 2017 · Mar 22, 2017 · Mar 22, 2017 · Mar 22, 2017 · Mar 22, 2017
Showing with 12 additions and 8 deletions.

+12 −8 ksp_plugin/plugin.cpp
diff --git a/ksp_plugin/plugin.cpp b/ksp_plugin/plugin.cpp
@@ -380,14 +380,18 @@ void Plugin::InsertOrKeepVessel(GUID const& vessel_guid,
   CHECK(!initializing_);
   not_null<Celestial const*> parent =
       FindOrDie(celestials_, parent_index).get();
-  GUIDToOwnedVessel::iterator it;
-  std::tie(it, inserted) =
-      vessels_.emplace(vessel_guid,
-                       make_not_null_unique<Vessel>(vessel_guid,
-                                                    vessel_name,
-                                                    parent,
-                                                    ephemeris_.get(),
-                                                    prediction_parameters_));
+  auto it = vessels_.find(vessel_guid);
+  if (it == vessels_.end()) {
+    std::tie(it, inserted) =
+        vessels_.emplace(vessel_guid,
+                         make_not_null_unique<Vessel>(vessel_guid,
+                                                      vessel_name,
+                                                      parent,
+                                                      ephemeris_.get(),
+                                                      prediction_parameters_));
+  } else {
+    inserted = false;
+  }
   not_null<Vessel*> const vessel = it->second.get();
   if (vessel->name() != vessel_name) {
     vessel->set_name(vessel_name);