From 25fa70fe9e0e203a1642cb86af5b949dcaf19c7a Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 26 May 2022 17:36:05 +1000 Subject: [PATCH] Qt: Fix loading save state from manual file --- pcsx2-qt/MainWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index 6a229ca1a5..61d4fa9633 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -1893,7 +1893,9 @@ void MainWindow::loadSaveStateFile(const QString& filename, const QString& state { if (m_vm_valid) { - g_emu_thread->loadState(filename); + if (!filename.isEmpty() && m_current_disc_path != filename) + g_emu_thread->changeDisc(m_current_disc_path); + g_emu_thread->loadState(state_filename); } else {