From f802dc14c1c5b4423ef3aa4244a639c919fd4fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 23 May 2018 14:12:26 +0200 Subject: [PATCH] Remove useless BootManager::Stop It's not used anywhere other than in DolphinQt2, where the usage is incorrect and stupid since we shouldn't be trying to stop the core and 'restore config' that was changed by the core at app exit time, but immediately when the core is being shut down. --- Source/Core/Core/BootManager.cpp | 6 ------ Source/Core/Core/BootManager.h | 2 -- Source/Core/DolphinQt2/Main.cpp | 1 - 3 files changed, 9 deletions(-) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index eeeccee467..9d524f7df3 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -390,12 +390,6 @@ bool BootCore(std::unique_ptr boot) return Core::Init(std::move(boot)); } -void Stop() -{ - Core::Stop(); - RestoreConfig(); -} - // SYSCONF can be modified during emulation by the user and internally, which makes it // a bad idea to just always overwrite it with the settings from the base layer. // diff --git a/Source/Core/Core/BootManager.h b/Source/Core/Core/BootManager.h index a068247e50..b89dfac324 100644 --- a/Source/Core/Core/BootManager.h +++ b/Source/Core/Core/BootManager.h @@ -15,8 +15,6 @@ namespace BootManager { bool BootCore(std::unique_ptr parameters); -// Stop the emulation core and restore the configuration. -void Stop(); // Synchronise Dolphin's configuration with the SYSCONF (which may have changed during emulation), // and restore settings that were overriden by per-game INIs or for some other reason. void RestoreConfig(); diff --git a/Source/Core/DolphinQt2/Main.cpp b/Source/Core/DolphinQt2/Main.cpp index c3c62ca06f..cce233098a 100644 --- a/Source/Core/DolphinQt2/Main.cpp +++ b/Source/Core/DolphinQt2/Main.cpp @@ -220,7 +220,6 @@ int main(int argc, char* argv[]) retval = app.exec(); } - BootManager::Stop(); Core::Shutdown(); UICommon::Shutdown(); Host::GetInstance()->deleteLater();