diff --git a/PowerEditor/bin/updater/GUP.exe b/PowerEditor/bin/updater/GUP.exe index 5ffdf905..ba9b7a84 100644 Binary files a/PowerEditor/bin/updater/GUP.exe and b/PowerEditor/bin/updater/GUP.exe differ diff --git a/PowerEditor/src/MISC/Process/Process.cpp b/PowerEditor/src/MISC/Process/Process.cpp index c17b7e54..9fdd4b12 100644 --- a/PowerEditor/src/MISC/Process/Process.cpp +++ b/PowerEditor/src/MISC/Process/Process.cpp @@ -34,9 +34,11 @@ void Process::run() { TCHAR *opVerb = TEXT("open"); +/* winVer winVersion = (NppParameters::getInstance())->getWinVersion(); if (winVersion == WV_VISTA || winVersion == WV_WIN7) opVerb = TEXT("runas"); +*/ ::ShellExecute(NULL, opVerb, _command.c_str(), _args.c_str(), _curDir.c_str(), SW_SHOWNORMAL); } diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 1bb6913e..9025ea83 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -4845,7 +4845,7 @@ struct Quote{ const char *_quote; }; -const int nbQuote = 69; +const int nbQuote = 73; Quote quotes[nbQuote] = { {"Notepad++", "Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size.\nBy optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment."}, {"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."}, @@ -4914,14 +4914,12 @@ Quote quotes[nbQuote] = { {"Anonymous #37", "My software never has bugs. It just develops random features."}, {"Anonymous #38", "LISP = Lots of Irritating Silly Parentheses."}, {"Anonymous #39", "Perl, the only language that looks the same before and after RSA encryption."}, +{"Anonymous #40", "People ask me why, as an atheist, I still say: OH MY GOD.\nIt makes perfect sense: We say \"Oh my God\" when something is UNBELIEVABLE."}, +{"Anonymous #41", "1. Dig a hole.\n2. Name it love.\n3. Watch people falling in love.\n"}, {"Hustle Man", "Politicians are like sperm.\nOne in a million turn out to be an actual human being."}, +{"Confucius", "It's good to meet girl in park.\nBut better to park meat in girl."}, +{"Friedrich Nietzsche", "There is not enough love and goodness in the world to permit giving any of it away to imaginary beings."}, {"Chewbacca", "Uuuuuuuuuur Ahhhhrrrrrr\nUhrrrr Ahhhhrrrrrr\nAaaarhg..."} -//{"", ""}, -//{"", ""}, -//{"", ""}, -//{"", ""}, -//{"", ""}, -//{"", ""}, }; diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index 3bea3607..13908f82 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -340,13 +340,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) doUpdate = false; } - // Vista/Win7 UAC issue - bool isVista = (curWinVer >= WV_VISTA); - if (!winSupported) nppGui._doesExistUpdater = false; - if (TheFirstOne && isUpExist && doUpdate && winSupported && !isVista) + if (TheFirstOne && isUpExist && doUpdate && winSupported) { Process updater(updaterFullPath.c_str(), version.c_str(), updaterDir.c_str()); updater.run();