From 1e20b1b154d9716f9ff9fcc9c4398eb3f5762bf1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 4 Jan 2015 10:49:52 +0000
Subject: fatal error to be issued any time we can't load a Std* plugin

git-svn-id: http://svn.miranda-ng.org/main/trunk@11764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/plugins/newplugins.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/modules/plugins')

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index f30efaa103..5c16845279 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -149,12 +149,8 @@ int LoadStdPlugins()
 		if (pluginDefault[i].pImpl)
 			continue;
 
-		if (!LoadCorePlugin(pluginDefault[i])) {
-			TCHAR tszBuf[512];
-			mir_sntprintf(tszBuf, SIZEOF(tszBuf), TranslateT("Core plugin '%s' cannot be loaded or missing. Miranda will exit now"), pluginDefault[i].stdplugname);
-			MessageBox(NULL, tszBuf, TranslateT("Fatal error"), MB_OK | MB_ICONSTOP);
+		if (!LoadCorePlugin(pluginDefault[i]))
 			return 1;
-		}
 	}
 
 	if (pluginDefault[13].pImpl == NULL)
@@ -543,6 +539,11 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic)
 	return true;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+// Core plugins support
+
+static TCHAR tszCoreErr[] = LPGENT("Core plugin '%s' cannot be loaded or missing. Miranda will exit now");
+
 bool LoadCorePlugin(MuuidReplacement& mr)
 {
 	TCHAR exe[MAX_PATH], tszPlugName[MAX_PATH];
@@ -553,6 +554,8 @@ bool LoadCorePlugin(MuuidReplacement& mr)
 	pluginEntry* pPlug = OpenPlugin(tszPlugName, _T("Core"), exe);
 	if (pPlug->pclass & PCLASS_FAILED) {
 LBL_Error:
+		MessageBox(NULL, CMString(FORMAT, TranslateTS(tszCoreErr), mr.stdplugname), TranslateT("Fatal error"), MB_OK | MB_ICONSTOP);
+
 		Plugin_UnloadDyn(pPlug);
 		mr.pImpl = NULL;
 		return false;
-- 
cgit v1.2.3