Merge pull request #12201 from fabricecaruso/master

SaveStates : Fix MainWindow.m_state_slot is not restored from Qt.ini Emulation/StateSlot.
dolphin-emu · Sep 28, 2023 · 45c8597 · 45c8597
2 parents 5b68449 + 2b2fd42
commit 45c8597
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -280,6 +280,9 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
     }
   }
 
+  m_state_slot =
+      std::clamp(Settings::Instance().GetStateSlot(), 1, static_cast<int>(State::NUM_STATES));
+
   QSettings& settings = Settings::GetQSettings();
 
   restoreState(settings.value(QStringLiteral("mainwindow/state")).toByteArray());