From 7fc9837e1f9bbd0f0687fea96cda8dfbf4c1932b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 6 Mar 2013 16:23:30 +0000
Subject: fix for Options/OldPluginSettings: old mode never worked, even being
 set in a database

git-svn-id: http://svn.miranda-ng.org/main/trunk@3906 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/options/options.cpp    | 4 ++++
 src/modules/plugins/pluginopts.cpp | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index e7fd848af1..7c49a8c973 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -41,6 +41,8 @@ static int FilterPage = 0;
 static int FilterLoadProgress = 100;
 static int FilterTimerId = 0;
 
+extern bool bOldMode;
+
 struct OptionsPageInit
 {
 	int pageCount;
@@ -1394,6 +1396,8 @@ static int OptModulesLoaded(WPARAM, LPARAM)
 	mi.pszName = LPGEN("&Options...");
 	mi.pszService = "Options/OptionsCommand";
 	Menu_AddMainMenuItem(&mi);
+
+	bOldMode = db_get_b(NULL, "Options", "OldPluginSettings", false) != 0;
 	return 0;
 }
 
diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp
index 12aa248e31..0b514b91c1 100644
--- a/src/modules/plugins/pluginopts.cpp
+++ b/src/modules/plugins/pluginopts.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern MUUID miid_clist, miid_database, miid_protocol;
 HANDLE hevLoadModule, hevUnloadModule;
-static bool bOldMode = false;
+bool bOldMode = false;
 
 /////////////////////////////////////////////////////////////////////////////////////////
 //   Plugins options page dialog
@@ -495,7 +495,6 @@ int PluginOptionsInit(WPARAM wParam, LPARAM)
 
 void LoadPluginOptions()
 {
-	bOldMode = db_get_b(NULL, "Options", "OldPluginSettings", false) != 0;
 	hevLoadModule = CreateHookableEvent(ME_SYSTEM_MODULELOAD);
 	hevUnloadModule = CreateHookableEvent(ME_SYSTEM_MODULEUNLOAD);
 }
-- 
cgit v1.2.3