From 1b803d38364387b39bb9ff14d20121fcecb04fea Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 25 Oct 2023 02:49:47 +0200 Subject: [PATCH] early-access version 3946 --- README.md | 2 +- .../vulkan_common/vulkan_wrapper.cpp | 2 +- src/yuzu/main.cpp | 26 ++++++++----------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f38d11f12..2ade34585 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3945. +This is the source code for early-access 3946. ## Legal Notice diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 15ad6629c..b85edd277 100755 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -522,7 +522,7 @@ Instance Instance::Create(u32 version, Span layers, SpanStop(); // Update game list to show new play time game_list->PopulateAsync(UISettings::values.game_dirs); - if (OnShutdownBegin()) { - OnShutdownBeginDialog(); - } else { - OnEmulationStopped(); - } + OnEmulationStopped(); } } bool GMainWindow::ConfirmShutdownGame() { + bool showDialog = false; if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) { if (system->GetExitLocked()) { - if (!ConfirmForceLockedExit()) { - return false; - } + showDialog = ConfirmForceLockedExit(); } else { - if (!ConfirmChangeGame()) { - return false; - } + showDialog = ConfirmChangeGame(); } } else { if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Based_On_Game && system->GetExitLocked()) { - if (!ConfirmForceLockedExit()) { - return false; - } + showDialog = ConfirmForceLockedExit(); } } - return true; + + if (showDialog && OnShutdownBegin()) { + OnShutdownBeginDialog(); + } + + return showDialog; } void GMainWindow::OnLoadComplete() {