[Scummvm-git-logs] scummvm master -> 3e8ab22eb22abfc8a65be7b6f40da4b039a51e9f

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3e8ab22eb2 BASE: Don't attempt to unload detection code when building with static detection


Commit: 3e8ab22eb22abfc8a65be7b6f40da4b039a51e9f
    https://github.com/scummvm/scummvm/commit/3e8ab22eb22abfc8a65be7b6f40da4b039a51e9f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-07T14:38:51+02:00

Commit Message:
BASE: Don't attempt to unload detection code when building with static detection

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index 228c702857..cadf4d50be 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -557,7 +557,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			// Then, pass in the pointer to enginePlugin, with the matching type, so our function behaves as-is.
 			PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, enginePlugin);
 
-#if defined(UNCACHED_PLUGINS) && defined(DYNAMIC_MODULES)
+#if defined(UNCACHED_PLUGINS) && defined(DYNAMIC_MODULES) && !defined(DETECTION_STATIC)
 			// Unload all MetaEngines not needed for the current engine, if we're using uncached plugins
 			// to save extra memory.
 			PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE_DETECTION, plugin);