diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-05-17 22:08:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 22:08:57 +0200 |
| commit | 0b5d29a34741c839dd24f9b0ba914ea80049ee62 (patch) | |
| tree | 0f866634df4641663144081cb977dff449289f93 /Source/Core/DolphinQt2/MainWindow.cpp | |
| parent | 72a66d3fbb89a69a08c7bc0e4b67c4087332c586 (diff) | |
| parent | f25213139dd88202fe8053ea9deb2c0660b65417 (diff) | |
Merge pull request #6883 from spycrab/qt_fix_hk_state
Qt/HotkeyScheduler: Fix state loading
Diffstat (limited to 'Source/Core/DolphinQt2/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/MainWindow.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 50bc8ff032..bfc99aabe0 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -364,6 +364,15 @@ void MainWindow::ConnectHotkeys() connect(m_hotkey_scheduler, &HotkeyScheduler::ScreenShotHotkey, this, &MainWindow::ScreenShot); connect(m_hotkey_scheduler, &HotkeyScheduler::FullScreenHotkey, this, &MainWindow::FullScreen); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlot, this, &MainWindow::StateLoadSlotAt); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveSlot, this, &MainWindow::StateSaveSlotAt); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadLastSaved, this, + &MainWindow::StateLoadLastSavedAt); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadUndo, this, &MainWindow::StateLoadUndo); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveUndo, this, &MainWindow::StateSaveUndo); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveOldest, this, + &MainWindow::StateSaveOldest); + connect(m_hotkey_scheduler, &HotkeyScheduler::StateLoadSlotHotkey, this, &MainWindow::StateLoadSlot); connect(m_hotkey_scheduler, &HotkeyScheduler::StateSaveSlotHotkey, this, @@ -898,6 +907,11 @@ void MainWindow::StateLoadSlotAt(int slot) State::Load(slot); } +void MainWindow::StateLoadLastSavedAt(int slot) +{ + State::LoadLastSaved(slot); +} + void MainWindow::StateSaveSlotAt(int slot) { State::Save(slot, true); |
