Fix assert when model info is missing (Fixes #3192, PR #3194)

[skip ci]
multitheftauto · Sep 23, 2023 · d431e5e · d431e5e
1 parent 1f7937b
commit d431e5e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
@@ -812,10 +812,18 @@ void CModelInfoSA::ResetTextureDictionaryID()
 
 void CModelInfoSA::StaticResetTextureDictionaries()
 {
-    while (!ms_DefaultTxdIDMap.empty()) {
+    while (!ms_DefaultTxdIDMap.empty())
+    {
         const auto mi = pGame->GetModelInfo(ms_DefaultTxdIDMap.begin()->first);
-        assert(mi);
-        mi->ResetTextureDictionaryID();
+        if (mi)
+        {
+            mi->ResetTextureDictionaryID();
+        }
+        else
+        {
+            // Model was deallocated. Skip and remove it from our list.
+            ms_DefaultTxdIDMap.erase(ms_DefaultTxdIDMap.begin());
+        }
     }
 }