thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLUGINS: moved plugin-at-a-time unload to be after deleting the engine.

Browse source 
Calling the Engine's destructor after unloading the plugin caused crashes.

svn-id: r54242
This commit is contained in:
Yotam Barnoy 2010-11-15 13:36:34 +00:00
parent 8664535029
commit 457127d2a6
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
base/main.cpp
View file

@ -215,11 +215,6 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
// Run the engine // Run the engine
Common::Error result = engine->run(); Common::Error result = engine->run();
#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
// do our best to prevent fragmentation by unloading as soon as we can
PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, NULL, false);
#endif
// Inform backend that the engine finished // Inform backend that the engine finished
system.engineDone(); system.engineDone();
@ -410,6 +405,11 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Try to run the game // Try to run the game
Common::Error result = runGame(plugin, system, specialDebug); Common::Error result = runGame(plugin, system, specialDebug);
#if defined(ONE_PLUGIN_AT_A_TIME) && defined(DYNAMIC_MODULES)
// do our best to prevent fragmentation by unloading as soon as we can
PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, NULL, false);
#endif
// Did an error occur ? // Did an error occur ?
if (result != Common::kNoError) { if (result != Common::kNoError) {
// Shows an informative error dialog if starting the selected game failed. // Shows an informative error dialog if starting the selected game failed.