ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6949 from leoetlino/stop 

Remove useless BootManager::Stop
This commit is contained in:
Léo Lam 2018-05-26 11:45:14 +02:00 committed by GitHub
parent 98e288cb4b f802dc14c1
commit 3f81c30e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/BootManager.cpp
View File

@ -390,12 +390,6 @@ bool BootCore(std::unique_ptr<BootParameters> boot)
return Core::Init(std::move(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 // 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. // a bad idea to just always overwrite it with the settings from the base layer.
// //

2
Source/Core/Core/BootManager.h
View File

@ -15,8 +15,6 @@ namespace BootManager
{ {
bool BootCore(std::unique_ptr<BootParameters> parameters); 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), // 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. // and restore settings that were overriden by per-game INIs or for some other reason.
void RestoreConfig(); void RestoreConfig();

1
Source/Core/DolphinQt2/Main.cpp
View File

@ -220,7 +220,6 @@ int main(int argc, char* argv[])
retval = app.exec(); retval = app.exec();
} }
BootManager::Stop();
Core::Shutdown(); Core::Shutdown();
UICommon::Shutdown(); UICommon::Shutdown();
Host::GetInstance()->deleteLater(); Host::GetInstance()->deleteLater();