From df59fd5b0ee955952a78431edf035fa9058043fc Mon Sep 17 00:00:00 2001
From: Peace-Maker <peace-maker@wcfan.de>
Date: Mon, 29 Feb 2016 16:40:24 +0100
Subject: [PATCH] Fix scheduled plugin unloading

When unloading a plugin no plugin is allowed to execute code. There's
been some flawed logic in the scheduling, leading it to bail out if the
plugin was marked for scheduled unloading..

Also change the "error" message of `sm plugins unload` to something
nice.
---
 core/logic/PluginSys.cpp | 10 +++-------
 core/logic/PluginSys.h   |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/core/logic/PluginSys.cpp b/core/logic/PluginSys.cpp
index c820ddf8..0c6bce28 100644
--- a/core/logic/PluginSys.cpp
+++ b/core/logic/PluginSys.cpp
@@ -1435,11 +1435,7 @@ void CPluginManager::TryRefreshDependencies(CPlugin *pPlugin)
 bool CPluginManager::UnloadPlugin(IPlugin *plugin)
 {
 	CPlugin *pPlugin = (CPlugin *)plugin;
-	return ScheduleUnload(pPlugin);
-}
 
-bool CPluginManager::ScheduleUnload(CPlugin *pPlugin)
-{
 	// Should not be recursively removing.
 	assert(m_plugins.contains(pPlugin));
 
@@ -1460,8 +1456,8 @@ bool CPluginManager::ScheduleUnload(CPlugin *pPlugin)
 
 	if (any_active) {
 		pPlugin->SetWaitingToUnload();
-		ScheduleTaskForNextFrame([this, pPlugin] () -> void {
-			ScheduleUnload(pPlugin);
+		ScheduleTaskForNextFrame([this, pPlugin]() -> void {
+			UnloadPluginImpl(pPlugin);
 		});
 		return false;
 	}
@@ -1855,7 +1851,7 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const ICommandArg
 			}
 			else
 			{
-				rootmenu->ConsolePrint("[SM] Failed to unload plugin %s.", name);
+				rootmenu->ConsolePrint("[SM] Plugin %s will be unloaded on the next frame.", name);
 			}
 
 			return;
diff --git a/core/logic/PluginSys.h b/core/logic/PluginSys.h
index 53a6070f..928b39b3 100644
--- a/core/logic/PluginSys.h
+++ b/core/logic/PluginSys.h
@@ -462,7 +462,6 @@ private:
 	bool RequireExtensions(CPlugin *pPlugin);
 	bool FindOrRequirePluginDeps(CPlugin *pPlugin);
 
-	bool ScheduleUnload(CPlugin *plugin);
 	void UnloadPluginImpl(CPlugin *plugin);
 
 	void Purge(CPlugin *plugin);