ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Don't load confirm shutdown/render separate/etc from base

This commit is contained in:
Connor McLaughlin 2022-10-22 13:43:12 +10:00 committed by refractionpcsx2
parent 2815bd177c
commit fb9c9cb172
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2-qt/MainWindow.cpp
View File

@ -969,7 +969,7 @@ void MainWindow::updateWindowState(bool force_visible)
return; return;
const bool hide_window = !isRenderingToMain() && shouldHideMainWindow(); const bool hide_window = !isRenderingToMain() && shouldHideMainWindow();
const bool disable_resize = Host::GetBaseBoolSettingValue("UI", "DisableWindowResize", false); const bool disable_resize = Host::GetBoolSettingValue("UI", "DisableWindowResize", false);
const bool has_window = s_vm_valid || m_display_widget; const bool has_window = s_vm_valid || m_display_widget;
// Need to test both valid and display widget because of startup (vm invalid while window is created). // Need to test both valid and display widget because of startup (vm invalid while window is created).
@ -1041,7 +1041,7 @@ bool MainWindow::shouldHideMouseCursor() const
bool MainWindow::shouldHideMainWindow() const bool MainWindow::shouldHideMainWindow() const
{ {
// NOTE: We can't use isRenderingToMain() here, because this happens post-fullscreen-switch. // NOTE: We can't use isRenderingToMain() here, because this happens post-fullscreen-switch.
return Host::GetBaseBoolSettingValue("UI", "HideMainWindowWhenRunning", false) || return Host::GetBoolSettingValue("UI", "HideMainWindowWhenRunning", false) ||
(g_emu_thread->shouldRenderToMain() && isRenderingFullscreen()) || (g_emu_thread->shouldRenderToMain() && isRenderingFullscreen()) ||
QtHost::InNoGUIMode(); QtHost::InNoGUIMode();
} }
@ -1128,7 +1128,7 @@ bool MainWindow::requestShutdown(bool allow_confirm /* = true */, bool allow_sav
bool save_state = allow_save_to_state && default_save_to_state; bool save_state = allow_save_to_state && default_save_to_state;
// Only confirm on UI thread because we need to display a msgbox. // Only confirm on UI thread because we need to display a msgbox.
if (!m_is_closing && allow_confirm && !GSDumpReplayer::IsReplayingDump() && Host::GetBaseBoolSettingValue("UI", "ConfirmShutdown", true)) if (!m_is_closing && allow_confirm && !GSDumpReplayer::IsReplayingDump() && Host::GetBoolSettingValue("UI", "ConfirmShutdown", true))
{ {
VMLock lock(pauseAndLockVM()); VMLock lock(pauseAndLockVM());

2
pcsx2-qt/QtHost.cpp
View File

@ -606,7 +606,7 @@ void Host::CheckForSettingsChanges(const Pcsx2Config& old_config)
bool EmuThread::shouldRenderToMain() const bool EmuThread::shouldRenderToMain() const
{ {
return !Host::GetBaseBoolSettingValue("UI", "RenderToSeparateWindow", false) && !QtHost::InNoGUIMode(); return !Host::GetBoolSettingValue("UI", "RenderToSeparateWindow", false) && !QtHost::InNoGUIMode();
} }
void EmuThread::toggleSoftwareRendering() void EmuThread::toggleSoftwareRendering()