From e9c3e5ef054efc0904bf2f6044c3cae3751e74b5 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 21 Aug 2014 13:32:01 +0000
Subject: crash fix when dbeditorpp is launched from the command string

git-svn-id: http://svn.miranda-ng.org/main/trunk@10261 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/DbEditorPP/src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 74dd0b2574..ebdd85920b 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -143,6 +143,8 @@ static int OnTTBLoaded(WPARAM wParam, LPARAM lParam)
 
 int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 {
+	addIcons();
+
 	// Register menu item
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.position = 1900000001;
@@ -200,6 +202,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam)
 
 INT_PTR ServiceMode(WPARAM wParam, LPARAM lParam)
 {
+	addIcons();
 	bServiceMode = TRUE;
 
 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, DBSettingChanged);
@@ -217,9 +220,6 @@ extern "C" __declspec(dllexport) int Load(void)
 {
 	mir_getLP(&pluginInfoEx);
 
-	// icons
-	addIcons();
-
 	hwnd2mainWindow = hwnd2watchedVarsWindow = hwnd2importWindow = 0;
 	hRestore = NULL;
 	g_db = GetCurrentDatabase();
-- 
cgit v1.2.3