diff --git a/android/app/src/cpp/android_host_interface.cpp b/android/app/src/cpp/android_host_interface.cpp index aeac2fd24..4eaa3107d 100644 --- a/android/app/src/cpp/android_host_interface.cpp +++ b/android/app/src/cpp/android_host_interface.cpp @@ -583,7 +583,6 @@ void AndroidHostInterface::OnRunningGameChanged(const std::string& path, CDImage const std::string& game_title) { CommonHostInterface::OnRunningGameChanged(path, image, game_code, game_title); - ApplySettings(true); if (m_emulation_activity_object) { diff --git a/src/duckstation-nogui/nogui_host_interface.cpp b/src/duckstation-nogui/nogui_host_interface.cpp index a04a26dbb..e8f9c5760 100644 --- a/src/duckstation-nogui/nogui_host_interface.cpp +++ b/src/duckstation-nogui/nogui_host_interface.cpp @@ -186,16 +186,6 @@ void NoGUIHostInterface::ReleaseHostDisplay() m_display->SetVSync(true); } -void NoGUIHostInterface::OnRunningGameChanged(const std::string& path, CDImage* image, const std::string& game_code, - const std::string& game_title) -{ - CommonHostInterface::OnRunningGameChanged(path, image, game_code, game_title); - - // TODO: Move to common - if (g_settings.apply_game_settings) - ApplySettings(true); -} - void NoGUIHostInterface::RequestExit() { m_quit_request = true; diff --git a/src/duckstation-nogui/nogui_host_interface.h b/src/duckstation-nogui/nogui_host_interface.h index b8fa0f62f..b70e3496b 100644 --- a/src/duckstation-nogui/nogui_host_interface.h +++ b/src/duckstation-nogui/nogui_host_interface.h @@ -41,9 +41,6 @@ protected: bool AcquireHostDisplay() override; void ReleaseHostDisplay() override; - void OnRunningGameChanged(const std::string& path, CDImage* image, const std::string& game_code, - const std::string& game_title) override; - void RequestExit() override; virtual void PollAndUpdate() override; diff --git a/src/duckstation-qt/qthostinterface.cpp b/src/duckstation-qt/qthostinterface.cpp index 45f6d6b3b..36dff0cdd 100644 --- a/src/duckstation-qt/qthostinterface.cpp +++ b/src/duckstation-qt/qthostinterface.cpp @@ -676,7 +676,6 @@ void QtHostInterface::OnRunningGameChanged(const std::string& path, CDImage* ima const std::string& game_title) { CommonHostInterface::OnRunningGameChanged(path, image, game_code, game_title); - applySettings(true); if (!System::IsShutdown()) { diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index 871056b35..336a64230 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -911,6 +911,9 @@ void CommonHostInterface::OnRunningGameChanged(const std::string& path, CDImage* { HostInterface::OnRunningGameChanged(path, image, game_code, game_title); + if (g_settings.apply_game_settings) + ApplySettings(true); + if (!System::IsShutdown()) { System::SetCheatList(nullptr);