From 3d8bfe9fd7aa830a2567199c95ded6286c9eec22 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Sep 2014 20:27:43 +0000 Subject: fix for registering Folders in CrashDumper git-svn-id: http://svn.miranda-ng.org/main/trunk@10602 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CrashDumper/src/crshdmp.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'plugins') diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 5dc776fa2f..dfbd7d3557 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -212,23 +212,21 @@ static int ModulesLoaded(WPARAM, LPARAM) CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)SIZEOF(temp), (LPARAM)temp); crs_a2t(vertxt, temp); - profname = Utils_ReplaceVarsT(_T("%miranda_profilename%.dat")); - if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) - profpath = mir_tstrdup(_T("%miranda_userdata%")); - else - profpath = Utils_ReplaceVarsT(_T("%miranda_userdata%")); + if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) { + replaceStrT(profpath, _T("%miranda_userdata%")); + + hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Crash Reports"), CrashLogFolder); + hVerInfoFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Version Information"), VersionInfoFolder); + + HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersPathChanged); + FoldersPathChanged(0, 0); + } mir_sntprintf(CrashLogFolder, MAX_PATH, TEXT("%s\\CrashLog"), profpath); mir_sntprintf(VersionInfoFolder, MAX_PATH, TEXT("%s"), profpath); SetExceptionHandler(); - hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Crash Reports"), CrashLogFolder); - hVerInfoFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Version Information"), VersionInfoFolder); - - FoldersPathChanged(0, 0); - - HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersPathChanged); HookEvent(ME_TTB_MODULELOADED, ToolbarModulesLoaded); UploadInit(); @@ -331,6 +329,9 @@ extern "C" int __declspec(dllexport) Load(void) dtsubfldr = db_get_b(NULL, PluginName, "SubFolders", 1) != 0; mir_getLP(&pluginInfoEx); + profname = Utils_ReplaceVarsT(_T("%miranda_profilename%.dat")); + profpath = Utils_ReplaceVarsT(_T("%miranda_userdata%")); + HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); HookEvent(ME_OPT_INITIALISE, OptionsInit); HookEvent(ME_TTB_MODULELOADED, ToolbarModulesLoaded); -- cgit v1.2.3