Fix model switching in armoury

armoury/src/gearview.cpp

@@ -348,7 +348,12 @@ void GearView::updatePart()
         }
 
         for (auto &queuedRemoval : queuedGearRemovals) {
-            mdlPart->removeModel(queuedRemoval.mdl);
+            auto it = std::find_if(loadedGears.cbegin(), loadedGears.cend(), [queuedRemoval](const LoadedGear &other) {
+                return queuedRemoval.info == other.info;
+            });
+
+            if (it != loadedGears.cend()) {
+                mdlPart->removeModel((*it).mdl);
                 loadedGears.erase(std::remove_if(loadedGears.begin(),
                                                  loadedGears.end(),
                                                  [queuedRemoval](const LoadedGear &other) {
@@ -358,6 +363,10 @@ void GearView::updatePart()
             }
         }
 
+        queuedGearAdditions.clear();
+        queuedGearRemovals.clear();
+    }
+
     if (face) {
         const auto mdlPath = QLatin1String(physis_build_character_path(CharacterCategory::Face, *face, currentRace, currentSubrace, currentGender));
         auto mdl_data = cache.lookupFile(mdlPath);

parts/mdl/mdlpart.cpp

@@ -278,9 +278,10 @@ void MDLPart::removeModel(const physis_MDL &mdl)
     models.erase(std::remove_if(models.begin(),
                                 models.end(),
                                 [mdl](const RenderModel &other) {
-                                    return mdl.lods == other.model.lods;
+                                    return mdl.p_ptr == other.model.p_ptr;
                                 }),
                  models.end());
+    Q_EMIT modelChanged();
 }
 
 #include "moc_mdlpart.cpp"