From f708183c82bcbcb823218e2577d570446d5e63c1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 13 Aug 2012 12:09:10 +0000 Subject: fix for a conflict with the old Folders git-svn-id: http://svn.miranda-ng.org/main/trunk@1441 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/PluginUpdater.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/PluginUpdater/src/PluginUpdater.cpp') diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 0ef0f64fc7..e481252b29 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -54,13 +54,15 @@ extern "C" __declspec(dllexport) int Load(void) { mir_getLP(&pluginInfoEx); - TCHAR* tszFolder = Utils_ReplaceVarsT(_T("%miranda_userdata%\\"DEFAULT_UPDATES_FOLDER)); - lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot)); - if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) { + if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Plugin Updater", MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER); + + if (hPluginUpdaterFolder) FoldersGetCustomPathT(hPluginUpdaterFolder, tszRoot, MAX_PATH, _T("")); + else { + mir_ptr tszFolder( Utils_ReplaceVarsT(_T("%miranda_userdata%\\"DEFAULT_UPDATES_FOLDER))); + lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot)); } - mir_free(tszFolder); LoadOptions(); InitPopupList(); -- cgit v1.2.3