From 8e874ed498d725fc3c6d6a1c294a8d84858f84b1 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Thu, 1 Jun 2023 00:41:04 +0200 Subject: [PATCH] early-access version 3627 --- README.md | 2 +- src/core/hle/service/nvdrv/core/syncpoint_manager.cpp | 2 +- src/yuzu/main.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 03e3cc60a..eecf8c2f2 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3626. +This is the source code for early-access 3627. ## Legal Notice diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp index fdc69ffc9..12f36258b 100755 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp +++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp @@ -64,7 +64,7 @@ void SyncpointManager::FreeSyncpoint(u32 id) { } bool SyncpointManager::IsSyncpointAllocated(u32 id) const { - return (id <= SyncpointCount) && syncpoints[id].reserved; + return (id < SyncpointCount) && syncpoints[id].reserved; } bool SyncpointManager::HasSyncpointExpired(u32 id, u32 threshold) const { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c6714a26d..0b90a34fd 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1893,6 +1893,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t } system->SetShuttingDown(false); + game_list->setDisabled(true); // Create and start the emulation thread emu_thread = std::make_unique(*system); @@ -2088,6 +2089,9 @@ void GMainWindow::OnEmulationStopped() { // When closing the game, destroy the GLWindow to clear the context after the game is closed render_window->ReleaseRenderTarget(); + // Enable game list + game_list->setEnabled(true); + Settings::RestoreGlobalState(system->IsPoweredOn()); system->HIDCore().ReloadInputDevices(); UpdateStatusButtons();