[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
This commit is contained in:
Don Ho 2012-11-05 23:13:40 +00:00
parent fa5fb505ce
commit cb383ab1b6

View File

@ -326,10 +326,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)
generic_string version = TEXT("-v"); generic_string version = TEXT("-v");
version += VERSION_VALUE; version += VERSION_VALUE;
winVer curWinVer = pNppParameters->getWinVersion();
bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE); bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE);
bool winSupported = (curWinVer >= WV_W2K);
bool doUpdate = nppGui._autoUpdateOpt._doAutoUpdate; bool doUpdate = nppGui._autoUpdateOpt._doAutoUpdate;
if (doUpdate) // check more detail if (doUpdate) // check more detail
@ -340,10 +338,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)
doUpdate = false; doUpdate = false;
} }
if (!winSupported) if (TheFirstOne && isUpExist && doUpdate)
nppGui._doesExistUpdater = false;
if (TheFirstOne && isUpExist && doUpdate && winSupported)
{ {
Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str()); Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str());
updater.run(); updater.run();