Qt: Fix emulation stopped signal

Same old bug as in WX. The core is not shut down until the on stopped
callback is invoked.
This commit is contained in:
Léo Lam 2017-06-16 15:27:00 +02:00
parent c6417e0e78
commit fb135c99e3
2 changed files with 8 additions and 1 deletions

View File

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

View File

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