same shit with Import Savefile

src/frontend/qt_sdl/EmuThread.cpp

@@ -618,6 +618,26 @@ void EmuThread::handleMessages()
             emuInstance->undoStateLoad();
             msgResult = 1;
             break;
+
+        case msg_ImportSavefile:
+            {
+                msgResult = 0;
+                auto f = Platform::OpenFile(msg.param.value<QString>().toStdString(), Platform::FileMode::Read);
+                if (!f) break;
+
+                u32 len = FileLength(f);
+
+                std::unique_ptr<u8[]> data = std::make_unique<u8[]>(len);
+                Platform::FileRewind(f);
+                Platform::FileRead(data.get(), len, 1, f);
+
+                assert(emuInstance->nds != nullptr);
+                emuInstance->nds->SetNDSSave(data.get(), len);
+
+                CloseFile(f);
+                msgResult = 1;
+            }
+            break;
         }
 
         msgSemaphore.release();
@@ -771,6 +791,14 @@ int EmuThread::undoStateLoad()
     return msgResult;
 }
 
+int EmuThread::importSavefile(const QString& filename)
+{
+    sendMessage(msg_EmuReset);
+    sendMessage({.type = msg_ImportSavefile, .param = filename});
+    waitMessage(2);
+    return msgResult;
+}
+
 void EmuThread::updateRenderer()
 {
     if (videoRenderer != lastVideoRenderer)

src/frontend/qt_sdl/EmuThread.h

@@ -80,6 +80,8 @@ public:
         msg_LoadState,
         msg_SaveState,
         msg_UndoStateLoad,
+
+        msg_ImportSavefile,
     };
 
     struct Message
@@ -119,6 +121,8 @@ public:
     int loadState(const QString& filename);
     int undoStateLoad();
 
+    int importSavefile(const QString& filename);
+
     bool emuIsRunning();
     bool emuIsActive();
 

src/frontend/qt_sdl/Window.cpp

@@ -1483,23 +1483,17 @@ void MainWindow::onUndoStateLoad()
 
 void MainWindow::onImportSavefile()
 {
-    emuThread->emuPause();
     QString path = QFileDialog::getOpenFileName(this,
                                             "Select savefile",
                                             globalCfg.GetQString("LastROMFolder"),
                                             "Savefiles (*.sav *.bin *.dsv);;Any file (*.*)");
 
     if (path.isEmpty())
-    {
-        emuThread->emuUnpause();
         return;
-    }
 
-    Platform::FileHandle* f = Platform::OpenFile(path.toStdString(), Platform::FileMode::Read);
-    if (!f)
+    if (!Platform::FileExists(path.toStdString()))
     {
         QMessageBox::critical(this, "melonDS", "Could not open the given savefile.");
-        emuThread->emuUnpause();
         return;
     }
 
@@ -1510,24 +1504,15 @@ void MainWindow::onImportSavefile()
                         "The emulation will be reset and the current savefile overwritten.",
                         QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok)
         {
-            emuThread->emuUnpause();
             return;
         }
-
-        emuInstance->reset();
     }
 
-    u32 len = FileLength(f);
-
-    std::unique_ptr<u8[]> data = std::make_unique<u8[]>(len);
-    Platform::FileRewind(f);
-    Platform::FileRead(data.get(), len, 1, f);
-
-    assert(emuInstance->nds != nullptr);
-    emuInstance->nds->SetNDSSave(data.get(), len);
-
-    CloseFile(f);
-    emuThread->emuUnpause();
+    if (!emuThread->importSavefile(path))
+    {
+        QMessageBox::critical(this, "melonDS", "Could not import the given savefile.");
+        return;
+    }
 }
 
 void MainWindow::onQuit()