2 files changed, 42 insertions, 5 deletions

diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index 45a778eda..003996802 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -181,11 +181,29 @@ void cPluginManager::Tick(float a_Dt)
 		cCSLock Lock(m_CSPluginsToUnload);
 		std::swap(m_PluginsToUnload, PluginsToUnload);
 	}
-	for (auto & plugin: m_Plugins)
+	for (auto & folder: PluginsToUnload)
 	{
-		if (std::find(PluginsToUnload.cbegin(), PluginsToUnload.cend(), plugin->GetFolderName()) != PluginsToUnload.cend())
+		bool HasUnloaded = false;
+		bool HasFound = false;
+		for (auto & plugin: m_Plugins)
 		{
-			plugin->Unload();
+			if (plugin->GetFolderName() == folder)
+			{
+				HasFound = true;
+				if (plugin->IsLoaded())
+				{
+					plugin->Unload();
+					HasUnloaded = true;
+				}
+			}
+		}
+		if (!HasFound)
+		{
+			LOG("Cannot unload plugin in folder \"%s\", there's no such plugin folder", folder.c_str());
+		}
+		else if (!HasUnloaded)
+		{
+			LOG("Cannot unload plugin in folder \"%s\", it has not been loaded.", folder.c_str());
 		}
 	}  // for plugin - m_Plugins[]
 
@@ -1510,7 +1528,7 @@ bool cPluginManager::LoadPlugin(const AString & a_FolderName)
 	}  // for plugin - m_Plugins[]
 
 	// Plugin not found
-	LOGD("%s: Plugin folder %s not found in the list of plugins.", __FUNCTION__, a_FolderName.c_str());
+	LOG("Cannot load plugin, folder \"%s\" not found.", a_FolderName.c_str());
 	return false;
 }
 
@@ -1556,6 +1574,22 @@ void cPluginManager::RemovePluginCommands(cPlugin * a_Plugin)
 
 
 
+bool cPluginManager::IsPluginLoaded(const AString & a_PluginName)
+{
+	for (auto & plugin: m_Plugins)
+	{
+		if (plugin->GetName() == a_PluginName)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+
+
+
+
 bool cPluginManager::BindCommand(const AString & a_Command, cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString)
 {
 	CommandMap::iterator cmd = m_Commands.find(a_Command);
diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h
index f32feb8a3..994f19943 100644
--- a/src/Bindings/PluginManager.h
+++ b/src/Bindings/PluginManager.h
@@ -265,7 +265,10 @@ public:
 	
 	/** Removes all command bindings that the specified plugin has made */
 	void RemovePluginCommands(cPlugin * a_Plugin);
-	
+
+	/** Returns true if the specified plugin is loaded. */
+	bool IsPluginLoaded(const AString & a_PluginName);  // tolua_export
+
 	/** Binds a command to the specified plugin. Returns true if successful, false if command already bound. */
 	bool BindCommand(const AString & a_Command, cPlugin * a_Plugin, const AString & a_Permission, const AString & a_HelpString);  // Exported in ManualBindings.cpp, without the a_Plugin param