From 5579b582572dbb3e3c842604c753f3e60f0845b8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 23 Mar 2014 17:59:15 +0000 Subject: fix for the langpack module load order git-svn-id: http://svn.miranda-ng.org/main/trunk@8714 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/modules.cpp | 2 +- src/modules/langpack/langpack.cpp | 2 -- src/modules/options/options.cpp | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/modules.cpp b/src/core/modules.cpp index 909e1811f2..c567efce1d 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -118,6 +118,7 @@ int LoadDefaultModules(void) if (LoadDatabaseModule()) return 1; // database is available here + Langpack_LoadLangpack(); if (LoadButtonModule()) return 1; if (LoadIcoLibModule()) return 1; if (LoadSkinIcons()) return 1; @@ -155,7 +156,6 @@ int LoadDefaultModules(void) if (LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first - Langpack_LoadLangpack(); Langpack_SortDuplicates(); if (LoadAccountsModule()) return 1; diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp index 56fd08f64f..80fa824b01 100644 --- a/src/modules/langpack/langpack.cpp +++ b/src/modules/langpack/langpack.cpp @@ -98,8 +98,6 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam) void Langpack_LoadLangpack(void) { - HookEvent(ME_OPT_INITIALISE, LangpackOptionsInit); - TCHAR szSearch[MAX_PATH]; PathToAbsoluteT(_T("\\"), szSearch); diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index 0239c10aa5..0e59b4e943 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -33,6 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ALL_MODULES_FILTER LPGEN("") #define CORE_MODULES_FILTER LPGEN("") +int LangpackOptionsInit(WPARAM, LPARAM); + static HANDLE hOptionsInitEvent; static HWND hwndOptions = NULL; static HWND hFilterSearchWnd = NULL; @@ -1381,6 +1383,8 @@ int LoadOptionsModule(void) { hwndOptions = NULL; hOptionsInitEvent = CreateHookableEvent(ME_OPT_INITIALISE); + HookEvent(ME_OPT_INITIALISE, LangpackOptionsInit); + CreateServiceFunction("Opt/AddPage", AddOptionsPage); CreateServiceFunction("Opt/OpenOptions", OpenOptions); CreateServiceFunction("Opt/OpenOptionsPage", OpenOptionsPage); -- cgit v1.2.3