diff options
| author | 2022-01-03 13:24:15 -0800 | |
|---|---|---|
| committer | 2022-01-03 13:24:15 -0800 | |
| commit | 05b7b177f66ae8cf5fb789363f00d96f720d86d5 (patch) | |
| tree | 3103f90a3b9c5e54743c0822049811074fcef9b7 /src | |
| parent | Merge pull request #7663 from german77/applet (diff) | |
| parent | yuzu: Fix UI elements not updating correctly (diff) | |
| download | yuzu-05b7b177f66ae8cf5fb789363f00d96f720d86d5.tar.gz yuzu-05b7b177f66ae8cf5fb789363f00d96f720d86d5.tar.xz yuzu-05b7b177f66ae8cf5fb789363f00d96f720d86d5.zip | |
Merge pull request #7662 from german77/uistatus
yuzu: Fix UI elements not updating correctly
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 1e02d715b..53f11a9ac 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1547,6 +1547,8 @@ void GMainWindow::ShutdownGame() { | |||
| 1547 | emu_thread->wait(); | 1547 | emu_thread->wait(); |
| 1548 | emu_thread = nullptr; | 1548 | emu_thread = nullptr; |
| 1549 | 1549 | ||
| 1550 | emulation_running = false; | ||
| 1551 | |||
| 1550 | discord_rpc->Update(); | 1552 | discord_rpc->Update(); |
| 1551 | 1553 | ||
| 1552 | // The emulation is stopped, so closing the window or not does not matter anymore | 1554 | // The emulation is stopped, so closing the window or not does not matter anymore |
| @@ -1585,8 +1587,6 @@ void GMainWindow::ShutdownGame() { | |||
| 1585 | emu_frametime_label->setVisible(false); | 1587 | emu_frametime_label->setVisible(false); |
| 1586 | renderer_status_button->setEnabled(true); | 1588 | renderer_status_button->setEnabled(true); |
| 1587 | 1589 | ||
| 1588 | emulation_running = false; | ||
| 1589 | |||
| 1590 | game_path.clear(); | 1590 | game_path.clear(); |
| 1591 | 1591 | ||
| 1592 | // When closing the game, destroy the GLWindow to clear the context after the game is closed | 1592 | // When closing the game, destroy the GLWindow to clear the context after the game is closed |