Flush the current firmware before resetting

JesseTG · Sep 21, 2023 · 3b445fb · 3b445fb
1 parent 3605095
commit 3b445fb
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp
@@ -531,12 +531,22 @@ PUBLIC_SYMBOL void retro_reset(void) {
     // Flush all data before resetting
     melonds::file::reset();
     melonds::sram::reset();
+    retro::task::find([](retro::task::TaskHandle& task) {
+        if (task.Identifier() == melonds::flushTaskId) {
+            // If this is the flush task we want to cancel...
+            task.Cancel();
+            return true;
+        }
+        return false; // Keep looking...
+    });
     retro::task::check();
 
     const optional<struct retro_game_info>& nds_info = retro::content::get_loaded_nds_info();
     const NDSHeader* header = nds_info ? reinterpret_cast<const NDSHeader*>(nds_info->data) : nullptr;
     melonds::InitConfig(header, melonds::screenLayout, melonds::input_state);
 
+    melonds::InitFlushFirmwareTask();
+
     {
         ZoneScopedN("NDS::Reset");
         NDS::Reset();