early-access version 3946

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
 

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -522,7 +522,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
         .applicationVersion = VK_MAKE_VERSION(0, 1, 0),
         .pEngineName = "yuzu Emulator",
         .engineVersion = VK_MAKE_VERSION(0, 1, 0),
-        .apiVersion = version,
+        .apiVersion = VK_API_VERSION_1_3,
     };
     const VkInstanceCreateInfo ci{
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,

src/yuzu/main.cpp

@@ -3440,35 +3440,31 @@ void GMainWindow::OnStopGame() {
         play_time_manager->Stop();
         // 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() {