Fixed save/load crash introduced with life-sustained systems change.

yowshi · Jul 6, 2014 · 4faca4f · 4faca4f
1 parent fedab0c
commit 4faca4f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
@@ -144,6 +144,14 @@ struct Engine::Implementation : public Ogre::WindowEventListener {
                 pair.second->entityManager().clear();
             }
         }
+        for (auto& kv : *m_prevShutdownSystems) {
+            kv.first->deactivate();
+        }
+        for (auto& kv : *m_nextShutdownSystems) {
+            kv.first->deactivate();
+        }
+        m_prevShutdownSystems->clear();
+        m_nextShutdownSystems->clear();
         m_currentGameState = nullptr;
         // Switch gamestate
         std::string gameStateName = savegame.get<std::string>("currentGameState");