Skip to content

Commit

Permalink
Merge pull request #10124 from malleoz/play-recording-hotkey-support
Browse files Browse the repository at this point in the history
HotkeyScheduler: add PlayRecording hotkey support
  • Loading branch information
JosJuice authored Sep 29, 2021
2 parents bb36739 + d5845ff commit c84c1ac
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Source/Core/DolphinQt/HotkeyScheduler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,13 @@ void HotkeyScheduler::Run()
emit ExitHotkey();

if (!Core::IsRunningAndStarted())
{
// Only check for Play Recording hotkey when no game is running
if (IsHotkey(HK_PLAY_RECORDING))
emit PlayRecording();

continue;
}

// Disc

Expand Down
1 change: 1 addition & 0 deletions Source/Core/DolphinQt/HotkeyScheduler.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class HotkeyScheduler : public QObject
void StateLoadUndo();
void StateSaveUndo();
void StartRecording();
void PlayRecording();
void ExportRecording();
void ToggleReadOnlyMode();
void ConnectWiiRemote(int id);
Expand Down
1 change: 1 addition & 0 deletions Source/Core/DolphinQt/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ void MainWindow::ConnectHotkeys()
&MainWindow::SetStateSlot);
connect(m_hotkey_scheduler, &HotkeyScheduler::StartRecording, this,
&MainWindow::OnStartRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::PlayRecording, this, &MainWindow::OnPlayRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::ExportRecording, this,
&MainWindow::OnExportRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::ConnectWiiRemote, this,
Expand Down

0 comments on commit c84c1ac

Please sign in to comment.