piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5648 from leoetlino/qt-shutdown

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt2/MainWindow.cpp
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()

2
Source/Core/DolphinQt2/MainWindow.h
View File

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