From d4721d50f7e583a4b57b41baa1859b16523ab4ab Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 27 Jan 2022 23:45:32 +1000 Subject: [PATCH] VMManager: Permit setting reload without active VM --- pcsx2/VMManager.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index 13bf26d245..9c9041bc14 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -215,7 +215,9 @@ void VMManager::LoadSettings() PAD::LoadConfig(*si); InputManager::ReloadSources(*si); InputManager::ReloadBindings(*si); - ApplyGameFixes(); + + if (HasValidVM()) + ApplyGameFixes(); } void VMManager::ApplyGameFixes() @@ -1132,9 +1134,12 @@ void VMManager::ApplySettings() const Pcsx2Config old_config(EmuConfig); LoadSettings(); - CheckForConfigChanges(old_config); - SetEmuThreadAffinities(false); + if (HasValidVM()) + { + CheckForConfigChanges(old_config); + SetEmuThreadAffinities(false); + } } void VMManager::ReloadGameSettings()