Merge pull request #5648 from leoetlino/qt-shutdown

Qt: Fix emulation stopped signal
This commit is contained in:
Leo Lam 2017-06-20 21:14:13 +02:00 committed by GitHub
commit 3fe8e102fc
2 changed files with 8 additions and 1 deletions

View File

@ -52,6 +52,7 @@ MainWindow::MainWindow() : QMainWindow(nullptr)
ConnectMenuBar(); ConnectMenuBar();
InitControllers(); InitControllers();
InitCoreCallbacks();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -88,6 +89,11 @@ void MainWindow::ShutdownControllers()
m_hotkey_scheduler->deleteLater(); m_hotkey_scheduler->deleteLater();
} }
void MainWindow::InitCoreCallbacks()
{
Core::SetOnStoppedCallback([this] { emit EmulationStopped(); });
}
static void InstallHotkeyFilter(QWidget* dialog) static void InstallHotkeyFilter(QWidget* dialog)
{ {
auto* filter = new WindowActivationEventFilter(); auto* filter = new WindowActivationEventFilter();
@ -291,7 +297,6 @@ void MainWindow::ForceStop()
{ {
BootManager::Stop(); BootManager::Stop();
HideRenderWidget(); HideRenderWidget();
emit EmulationStopped();
} }
void MainWindow::Reset() void MainWindow::Reset()

View File

@ -69,6 +69,8 @@ private:
void InitControllers(); void InitControllers();
void ShutdownControllers(); void ShutdownControllers();
void InitCoreCallbacks();
void StartGame(const QString& path); void StartGame(const QString& path);
void ShowRenderWidget(); void ShowRenderWidget();
void HideRenderWidget(); void HideRenderWidget();