Merge pull request #11621 from deReeperJosh/skylandersfilefix

Skylander Portal: Clearing and Reloading fix
dolphin-emu · Mar 7, 2023 · 16023ec · 16023ec
2 parents 946b2aa + 2585ae9
commit 16023ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp
@@ -1236,6 +1236,12 @@ bool SkylanderPortal::RemoveSkylander(u8 sky_num)
   std::lock_guard lock(sky_mutex);
   auto& skylander = skylanders[sky_num];
 
+  if (skylander.sky_file.IsOpen())
+  {
+    skylander.Save();
+    skylander.sky_file.Close();
+  }
+
   if (skylander.status & 1)
   {
     skylander.status = Skylander::REMOVING;

diff --git a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp
@@ -332,7 +332,6 @@ void SkylanderPortalWindow::ClearSkylander(u8 slot)
                            QMessageBox::Ok);
       return;
     }
-    system.GetSkylanderPortal().RemoveSkylander(slot_infos->portal_slot);
     m_sky_slots[slot].reset();
     UpdateEdits();
   }