diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-09-28 05:30:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 05:30:48 +0200 |
| commit | 45c859708223893134ad2ce33dd2a09df978e440 (patch) | |
| tree | 0d133216aae77693d6720b42af2ea9f92185ddef /Source/Core | |
| parent | 5b6844901fc854c2a049c1faf1c5e68275db2dd7 (diff) | |
| parent | 2b2fd4217ef9adc774329485530214c5c9bfffd1 (diff) | |
Merge pull request #12201 from fabricecaruso/master
SaveStates : Fix MainWindow.m_state_slot is not restored from Qt.ini Emulation/StateSlot.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 5e9bc67896..3e9596f72e 100644 --- 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()); |