1 files changed, 23 insertions, 1 deletions

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 5699766..62c124a 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -281,6 +281,7 @@ EmuThread::EmuThread(QObject* parent) : QThread(parent)
     connect(this, SIGNAL(windowEmuStop()), mainWindow, SLOT(onEmuStop()));
     connect(this, SIGNAL(windowEmuPause()), mainWindow->actPause, SLOT(trigger()));
     connect(this, SIGNAL(windowEmuReset()), mainWindow->actReset, SLOT(trigger()));
+    connect(this, SIGNAL(windowEmuFrameStep()), mainWindow->actFrameStep, SLOT(trigger()));
     connect(this, SIGNAL(windowLimitFPSChange()), mainWindow->actLimitFramerate, SLOT(trigger()));
     connect(this, SIGNAL(screenLayoutChange()), mainWindow->panel, SLOT(onScreenLayoutChanged()));
     connect(this, SIGNAL(windowFullscreenToggle()), mainWindow, SLOT(onFullscreenToggled()));
@@ -377,6 +378,7 @@ void EmuThread::run()
 
         if (Input::HotkeyPressed(HK_Pause)) emit windowEmuPause();
         if (Input::HotkeyPressed(HK_Reset)) emit windowEmuReset();
+        if (Input::HotkeyPressed(HK_FrameStep)) emit windowEmuFrameStep();
 
         if (Input::HotkeyPressed(HK_FullscreenToggle)) emit windowFullscreenToggle();
 
@@ -403,9 +405,10 @@ void EmuThread::run()
             }
         }
 
-        if (EmuRunning == 1)
+        if (EmuRunning == 1 || EmuRunning == 3)
         {
             EmuStatus = 1;
+            if (EmuRunning == 3) EmuRunning = 2;
 
             // update render settings if needed
             if (videoSettingsDirty)
@@ -655,6 +658,12 @@ void EmuThread::emuStop()
     if (micDevice)   SDL_PauseAudioDevice(micDevice, 1);
 }
 
+void EmuThread::emuFrameStep()
+{
+    if (EmuPause < 1) emit windowEmuPause();
+    EmuRunning = 3;
+}
+
 bool EmuThread::emuIsRunning()
 {
     return (EmuRunning == 1);
@@ -1306,6 +1315,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
         actStop = menu->addAction("Stop");
         connect(actStop, &QAction::triggered, this, &MainWindow::onStop);
 
+        actFrameStep = menu->addAction("Frame step");
+        connect(actFrameStep, &QAction::triggered, this, &MainWindow::onFrameStep);
+
         menu->addSeparator();
 
         actEnableCheats = menu->addAction("Enable cheats");
@@ -1509,6 +1521,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
     actPause->setEnabled(false);
     actReset->setEnabled(false);
     actStop->setEnabled(false);
+    actFrameStep->setEnabled(false);
 
     actSetupCheats->setEnabled(false);
 
@@ -2271,6 +2284,13 @@ void MainWindow::onStop()
     NDS::Stop();
 }
 
+void MainWindow::onFrameStep()
+{
+    if (!RunningSomething) return;
+
+    emuThread->emuFrameStep();
+}
+
 void MainWindow::onEnableCheats(bool checked)
 {
     Config::EnableCheats = checked?1:0;
@@ -2540,6 +2560,7 @@ void MainWindow::onEmuStart()
     actPause->setChecked(false);
     actReset->setEnabled(true);
     actStop->setEnabled(true);
+    actFrameStep->setEnabled(true);
     actImportSavefile->setEnabled(true);
 
     actSetupCheats->setEnabled(true);
@@ -2560,6 +2581,7 @@ void MainWindow::onEmuStop()
     actPause->setEnabled(false);
     actReset->setEnabled(false);
     actStop->setEnabled(false);
+    actFrameStep->setEnabled(false);
 
     actSetupCheats->setEnabled(false);
 }