diff --git a/PowerEditor/bin/updater/GUP.exe b/PowerEditor/bin/updater/GUP.exe index a0b70a20..d0de5f8e 100755 Binary files a/PowerEditor/bin/updater/GUP.exe and b/PowerEditor/bin/updater/GUP.exe differ diff --git a/PowerEditor/bin/updater/libcurl.dll b/PowerEditor/bin/updater/libcurl.dll index 740b97c3..ee21eb79 100644 Binary files a/PowerEditor/bin/updater/libcurl.dll and b/PowerEditor/bin/updater/libcurl.dll differ diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 5ef10400..a1227178 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2618,12 +2618,21 @@ void Notepad_plus::command(int id) generic_string updaterFullPath = updaterDir; PathAppend(updaterFullPath, TEXT("gup.exe")); - generic_string param = TEXT("-verbose -v"); - param += VERSION_VALUE; - + generic_string param; if (id == IDM_CONFUPDATERPROXY) + { param = TEXT("-options"); + } + else + { + param = TEXT("-verbose -v"); + param += VERSION_VALUE; + if (NppParameters::getInstance()->isx64()) + { + param += TEXT(" -px64"); + } + } Process updater(updaterFullPath.c_str(), param.c_str(), updaterDir.c_str()); updater.run(); diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index c3150e52..95c8e665 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -418,8 +418,8 @@ DEVOMER*/ generic_string updaterFullPath = updaterDir + TEXT("gup.exe"); - generic_string version = TEXT("-v"); - version += VERSION_VALUE; + generic_string updaterParams = TEXT("-v"); + updaterParams += VERSION_VALUE; bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE); @@ -438,7 +438,11 @@ DEVOMER*/ bool isGtXP = ver > WV_XP; if (TheFirstOne && isUpExist && doUpdate && isGtXP) { - Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str()); + if (pNppParameters->isx64()) + { + updaterParams += TEXT(" -px64"); + } + Process updater(updaterFullPath.c_str(), updaterParams.c_str(), updaterDir.c_str()); updater.run(); // Update next update date