From cb383ab1b663b12565a1bc9ecc0378778dd684c5 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 5 Nov 2012 23:13:40 +0000 Subject: [PATCH] [UPDATE] Remove wiondows version (95/98/ME) control for updater. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@981 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/winmain.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index 288fe3a3b..66faceeef 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -326,10 +326,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) generic_string version = TEXT("-v"); version += VERSION_VALUE; - winVer curWinVer = pNppParameters->getWinVersion(); - bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE); - bool winSupported = (curWinVer >= WV_W2K); + bool doUpdate = nppGui._autoUpdateOpt._doAutoUpdate; if (doUpdate) // check more detail @@ -340,10 +338,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) doUpdate = false; } - if (!winSupported) - nppGui._doesExistUpdater = false; - - if (TheFirstOne && isUpExist && doUpdate && winSupported) + if (TheFirstOne && isUpExist && doUpdate) { Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str()); updater.run();