From 6bc8f3ca48fe5a2be64ab91f0cdc1510b58b0892 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 15 Apr 2016 19:43:14 +0000 Subject: PluginUpdater: - Fixed plugin renaming - Disabled platform change until it will be fixed: To reproduce it: with x64 version, Go to PluginUpdater Options, change x64 to x32 and back, It'll stay grayed out, even after a complete restart. In fact, there is no way to change that setting back, except deleting it in database and a full Miranda restart. git-svn-id: http://svn.miranda-ng.org/main/trunk@16669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/DlgUpdate.cpp | 5 ++++- plugins/PluginUpdater/src/Utils.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins/PluginUpdater/src') diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 7f8728d96d..413c4bff83 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -629,8 +629,11 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, const TCHAR *tsz else if (isValidExtension(ffd.cFileName)) { // calculate the current file's relative name and store it into tszNewName TCHAR tszNewName[MAX_PATH]; - if (CheckFileRename(ffd.cFileName, tszNewName)) + if (CheckFileRename(ffd.cFileName, tszNewName)) { Netlib_LogfT(hNetlibUser, _T("File %s will be renamed to %s."), ffd.cFileName, tszNewName); + // Yes, we need the old file name, because this will be hashed later + mir_sntprintf(tszBuf, _T("%s\\%s"), tszFolder, ffd.cFileName); + } else { if (level == 0) { // Rename Miranda*.exe diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index ca31724626..69d60a03a8 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -37,7 +37,7 @@ void LoadOptions() opts.bForceRedownload = db_get_b(NULL, MODNAME, DB_SETTING_REDOWNLOAD, 0); opts.bSilentMode = db_get_b(NULL, MODNAME, "SilentMode", 0); opts.bBackup = db_get_b(NULL, MODNAME, "Backup", 0); - opts.bChangePlatform = db_get_b(NULL, MODNAME, DB_SETTING_CHANGEPLATFORM, 0); + opts.bChangePlatform = false; // db_get_b(NULL, MODNAME, DB_SETTING_CHANGEPLATFORM, 0); } #if MIRANDA_VER >= 0x0A00 -- cgit v1.2.3