piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5743 from spycrab/qt_fix_shutdown

Browse Source 
Qt: Fix multiple emulation shutdown bugs
This commit is contained in:
Leo Lam
2017-07-11 09:13:07 +02:00
committed by GitHub
parent ce4732dd96 ebe169a218
commit 1de9bf2cca
2 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ private slots:
void Pause();
// May ask for confirmation. Returns whether or not it actually stopped.
bool Stop();
bool RequestStop();
void ForceStop();
void Reset();
void FrameAdvance();
@ -88,6 +88,7 @@ private:
void ShowAboutDialog();
void ShowHotkeyDialog();
void OnStopComplete();
void dragEnterEvent(QDragEnterEvent* event) override;
void dropEvent(QDropEvent* event) override;
QSize sizeHint() const override;
@ -99,7 +100,9 @@ private:
RenderWidget* m_render_widget;
bool m_rendering_to_main;
bool m_stop_requested = false;
bool m_exit_requested = false;
int m_state_slot = 1;
QString m_pending_boot;
HotkeyScheduler* m_hotkey_scheduler;
ControllersWindow* m_controllers_window;