Fix incompatible plugin not being deleted issue

Unload incompatible plugin before deleting it. Fix #9377, close #9382
4 years ago · a55d46d170
parent b58a5cc227
commit a55d46d170
1 changed files with 10 additions and 2 deletions
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@ -275,10 +275,14 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath)
 		s += USERMSG;
 		if (::MessageBox(NULL, s.c_str(), pluginFilePath, MB_YESNO) == IDYES)
 		{
+			if (pi && pi->_hLib)
+			{
+				::FreeLibrary(pi->_hLib);
+			}
 			::DeleteFile(pluginFilePath);
 		}
 		delete pi;
-        return -1;
+		return -1;
 	}
 	catch (...)
 	{
@ -288,10 +292,14 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath)
 		msg += USERMSG;
 		if (::MessageBox(NULL, msg.c_str(), pluginFilePath, MB_YESNO) == IDYES)
 		{
+			if (pi && pi->_hLib)
+			{
+				::FreeLibrary(pi->_hLib);
+			}
 			::DeleteFile(pluginFilePath);
 		}
 		delete pi;
-        return -1;
+		return -1;
 	}
 }