early-access version 3946
This commit is contained in:
parent
0c99ec30a6
commit
1b803d3836
3 changed files with 13 additions and 17 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 3945.
|
This is the source code for early-access 3946.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -522,7 +522,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
|
||||||
.applicationVersion = VK_MAKE_VERSION(0, 1, 0),
|
.applicationVersion = VK_MAKE_VERSION(0, 1, 0),
|
||||||
.pEngineName = "yuzu Emulator",
|
.pEngineName = "yuzu Emulator",
|
||||||
.engineVersion = VK_MAKE_VERSION(0, 1, 0),
|
.engineVersion = VK_MAKE_VERSION(0, 1, 0),
|
||||||
.apiVersion = version,
|
.apiVersion = VK_API_VERSION_1_3,
|
||||||
};
|
};
|
||||||
const VkInstanceCreateInfo ci{
|
const VkInstanceCreateInfo ci{
|
||||||
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
|
||||||
|
|
|
@ -3440,35 +3440,31 @@ void GMainWindow::OnStopGame() {
|
||||||
play_time_manager->Stop();
|
play_time_manager->Stop();
|
||||||
// Update game list to show new play time
|
// Update game list to show new play time
|
||||||
game_list->PopulateAsync(UISettings::values.game_dirs);
|
game_list->PopulateAsync(UISettings::values.game_dirs);
|
||||||
if (OnShutdownBegin()) {
|
|
||||||
OnShutdownBeginDialog();
|
|
||||||
} else {
|
|
||||||
OnEmulationStopped();
|
OnEmulationStopped();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GMainWindow::ConfirmShutdownGame() {
|
bool GMainWindow::ConfirmShutdownGame() {
|
||||||
|
bool showDialog = false;
|
||||||
if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) {
|
if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) {
|
||||||
if (system->GetExitLocked()) {
|
if (system->GetExitLocked()) {
|
||||||
if (!ConfirmForceLockedExit()) {
|
showDialog = ConfirmForceLockedExit();
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (!ConfirmChangeGame()) {
|
showDialog = ConfirmChangeGame();
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (UISettings::values.confirm_before_stopping.GetValue() ==
|
if (UISettings::values.confirm_before_stopping.GetValue() ==
|
||||||
ConfirmStop::Ask_Based_On_Game &&
|
ConfirmStop::Ask_Based_On_Game &&
|
||||||
system->GetExitLocked()) {
|
system->GetExitLocked()) {
|
||||||
if (!ConfirmForceLockedExit()) {
|
showDialog = ConfirmForceLockedExit();
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showDialog && OnShutdownBegin()) {
|
||||||
|
OnShutdownBeginDialog();
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
|
return showDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnLoadComplete() {
|
void GMainWindow::OnLoadComplete() {
|
||||||
|
|
Loading…
Reference in a new issue