From fb9c9cb1724dbe4272d5155400a182e8633b2e9e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 22 Oct 2022 13:43:12 +1000 Subject: [PATCH] Qt: Don't load confirm shutdown/render separate/etc from base --- pcsx2-qt/MainWindow.cpp | 6 +++--- pcsx2-qt/QtHost.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index 4200cd82c2..c52d3a1aa7 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -969,7 +969,7 @@ void MainWindow::updateWindowState(bool force_visible) return; 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; // 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 { // 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()) || 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; // 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()); diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index 699fbbfaf6..53afdcb86d 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -606,7 +606,7 @@ void Host::CheckForSettingsChanges(const Pcsx2Config& old_config) bool EmuThread::shouldRenderToMain() const { - return !Host::GetBaseBoolSettingValue("UI", "RenderToSeparateWindow", false) && !QtHost::InNoGUIMode(); + return !Host::GetBoolSettingValue("UI", "RenderToSeparateWindow", false) && !QtHost::InNoGUIMode(); } void EmuThread::toggleSoftwareRendering()