Clear out state before deserialization - fixes many crashes.

src/citra_qt/bootmanager.cpp

@@ -132,7 +132,9 @@ void OpenGLWindow::Present() {
         return;
 
     context->makeCurrent(this);
+    if (VideoCore::g_renderer) {
         VideoCore::g_renderer->TryPresent(100);
+    }
     context->swapBuffers(this);
     auto f = context->versionFunctions<QOpenGLFunctions_3_3_Core>();
     f->glFinish();

src/common/serialization/boost_interval_set.hpp

@@ -12,7 +12,7 @@ namespace boost::serialization {
 
 template <class Archive, class T>
 void save(Archive& ar, const boost::icl::interval_set<T>& set, const unsigned int file_version) {
-    ar << static_cast<u64>(set.size());
+    ar << static_cast<u64>(set.iterative_size());
     for (auto& v : set) {
         ar << v;
     }
@@ -24,9 +24,9 @@ void load(Archive& ar, boost::icl::interval_set<T>& set, const unsigned int file
     ar >> count;
     set.clear();
     for (u64 i = 0; i < count; i++) {
-        T value{};
+        typename boost::icl::interval_set<T>::interval_type value{};
         ar >> value;
-        set.insert(value);
+        set.add(value);
     }
 }
 

src/core/core.cpp

@@ -478,7 +478,7 @@ void System::RegisterImageInterface(std::shared_ptr<Frontend::ImageInterface> im
     registered_image_interface = std::move(image_interface);
 }
 
-void System::Shutdown() {
+void System::Shutdown(bool is_deserializing) {
     // Log last frame performance stats
     const auto perf_results = GetAndResetPerfStats();
     telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed",
@@ -494,17 +494,19 @@ void System::Shutdown() {
     GDBStub::Shutdown();
     VideoCore::Shutdown();
     HW::Shutdown();
-    telemetry_session.reset();
+    if (!is_deserializing) {
         perf_stats.reset();
-    rpc_server.reset();
         cheat_engine.reset();
+        app_loader.reset();
+    }
+    telemetry_session.reset();
+    rpc_server.reset();
     archive_manager.reset();
     service_manager.reset();
     dsp_core.reset();
     cpu_cores.clear();
     kernel.reset();
     timing.reset();
-    app_loader.reset();
 
     if (video_dumper->IsDumping()) {
         video_dumper->StopDumping();
@@ -565,6 +567,7 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
     // This needs to be set from somewhere - might as well be here!
     if (Archive::is_loading::value) {
         Service::GSP::SetGlobalModule(*this);
+        memory->SetDSP(*dsp_core);
     }
 }
 

src/core/core.h

@@ -113,7 +113,7 @@ public:
     ResultStatus SingleStep();
 
     /// Shutdown the emulated system.
-    void Shutdown();
+    void Shutdown(bool is_deserializing = false);
 
     /// Shutdown and then load again
     void Reset();

src/core/savestate.cpp

@@ -8,6 +8,7 @@
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/zstd_compression.h"
+#include "core/cheats/cheats.h"
 #include "core/core.h"
 #include "core/savestate.h"
 #include "video_core/video_core.h"
@@ -158,6 +159,15 @@ void System::LoadState(u32 slot) {
         std::ios_base::binary};
     decompressed.clear();
 
+    // When loading, we want to make sure any lingering state gets cleared out before we begin.
+    // Shutdown, but persist a few things between loads...
+    Shutdown(true);
+
+    // Re-initialize everything like it was before
+    auto system_mode = this->app_loader->LoadKernelSystemMode();
+    auto n3ds_mode = this->app_loader->LoadKernelN3dsMode();
+    Init(*m_emu_window, *system_mode.first, *n3ds_mode.first);
+
     try {
 
         {