Permalink
Browse files

Merge pull request #6949 from leoetlino/stop

Remove useless BootManager::Stop
  • Loading branch information...
leoetlino committed May 26, 2018
2 parents 98e288c + f802dc1 commit 3f81c30e8ab351d1f3eb1d1d3fae81acf0bd06c5
Showing with 0 additions and 9 deletions.
  1. +0 −6 Source/Core/Core/BootManager.cpp
  2. +0 −2 Source/Core/Core/BootManager.h
  3. +0 −1 Source/Core/DolphinQt2/Main.cpp
@@ -390,12 +390,6 @@ bool BootCore(std::unique_ptr<BootParameters> 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.
//
@@ -15,8 +15,6 @@ namespace BootManager
{
bool BootCore(std::unique_ptr<BootParameters> 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();
@@ -220,7 +220,6 @@ int main(int argc, char* argv[])
retval = app.exec();
}
BootManager::Stop();
Core::Shutdown();
UICommon::Shutdown();
Host::GetInstance()->deleteLater();

0 comments on commit 3f81c30

Please sign in to comment.