From 9149988db38b64a55b624de030d224b5bb97ab80 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 19 Sep 2017 22:32:07 +0300
Subject: we need to remove mir_core.dll after waiting for restart

---
 src/mir_app/src/newplugins.cpp | 1 +
 src/miranda32/src/miranda.cpp  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp
index 12786e4692..ed8b47670c 100644
--- a/src/mir_app/src/newplugins.cpp
+++ b/src/mir_app/src/newplugins.cpp
@@ -862,6 +862,7 @@ static BOOL scanPluginsDir(WIN32_FIND_DATA *fd, wchar_t *path, WPARAM, LPARAM)
 int LoadNewPluginsModuleInfos(void)
 {
 	bModuleInitialized = TRUE;
+	DeleteFile(L"mir_core.dll");
 
 	LoadPluginOptions();
 
diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp
index bb95ad1e56..a42b367110 100644
--- a/src/miranda32/src/miranda.cpp
+++ b/src/miranda32/src/miranda.cpp
@@ -49,8 +49,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int)
 	GetEnvironmentVariable(L"PATH", ptszVal + cbPath + 1, cbSize);
 	SetEnvironmentVariable(L"PATH", ptszVal);
 
-	DeleteFile(L"mir_core.dll");
-
 	int retVal;
 	HINSTANCE hMirApp = LoadLibrary(L"mir_app.mir");
 	if (hMirApp == NULL) {
-- 
cgit v1.2.3