diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2016-04-15 19:43:14 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2016-04-15 19:43:14 +0000 |
| commit | 6bc8f3ca48fe5a2be64ab91f0cdc1510b58b0892 (patch) | |
| tree | 96467e4ce6a880a1d95a4f55946944ffba31e4cf | |
| parent | 35eaa182969aae253ccc7120af1bb966e38576d3 (diff) | |
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
| -rw-r--r-- | plugins/PluginUpdater/res/Resource.rc | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 5 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index 06f1c0ccdf..246e4f38f6 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -79,8 +79,8 @@ BEGIN EDITTEXT IDC_CUSTOMURL,12,187,267,16,ES_AUTOHSCROLL | WS_DISABLED
CTEXT "Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.",IDC_NEEDRESTARTLABEL,11,213,267,15,NOT WS_VISIBLE
GROUPBOX "",IDC_STATIC,212,122,58,40
- CONTROL "x86",IDC_X86,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,217,131,28,10
- CONTROL "x64",IDC_X64,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,217,146,28,10
+ CONTROL "x86", IDC_X86, "Button", BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP, 217, 131, 28, 10
+ CONTROL "x64", IDC_X64, "Button", BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP, 217, 146, 28, 10
END
IDD_POPUP DIALOGEX 0, 0, 316, 174
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
|