summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2023-06-01 09:05:18 -0400
committerGravatar GitHub2023-06-01 09:05:18 -0400
commit1a4f3b37f18f813f812432c7d77a6636abf512d4 (patch)
tree84ec7080823d3153cae9bce20c9fdac654212113 /src
parentMerge pull request #10518 from lat9nq/ffmpeg-zombie-var (diff)
parentyuzu: Disable game list while game is running (diff)
downloadyuzu-1a4f3b37f18f813f812432c7d77a6636abf512d4.tar.gz
yuzu-1a4f3b37f18f813f812432c7d77a6636abf512d4.tar.xz
yuzu-1a4f3b37f18f813f812432c7d77a6636abf512d4.zip
Merge pull request #10482 from german77/gamelist
yuzu: Disable game list while game is running
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 25cfef6d5..5b338c6e5 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1798,6 +1798,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
1798 } 1798 }
1799 1799
1800 system->SetShuttingDown(false); 1800 system->SetShuttingDown(false);
1801 game_list->setDisabled(true);
1801 1802
1802 // Create and start the emulation thread 1803 // Create and start the emulation thread
1803 emu_thread = std::make_unique<EmuThread>(*system); 1804 emu_thread = std::make_unique<EmuThread>(*system);
@@ -1993,6 +1994,9 @@ void GMainWindow::OnEmulationStopped() {
1993 // When closing the game, destroy the GLWindow to clear the context after the game is closed 1994 // When closing the game, destroy the GLWindow to clear the context after the game is closed
1994 render_window->ReleaseRenderTarget(); 1995 render_window->ReleaseRenderTarget();
1995 1996
1997 // Enable game list
1998 game_list->setEnabled(true);
1999
1996 Settings::RestoreGlobalState(system->IsPoweredOn()); 2000 Settings::RestoreGlobalState(system->IsPoweredOn());
1997 system->HIDCore().ReloadInputDevices(); 2001 system->HIDCore().ReloadInputDevices();
1998 UpdateStatusButtons(); 2002 UpdateStatusButtons();