From 1a50699e25e8b3e2604a38b23069fdaf572690cb Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 13 Aug 2018 21:08:44 +0200 Subject: [PATCH] Updated installer version check. --- README.md | 2 +- etc/setup/setup.nsi | 34 ++++++++++------------------------ 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 8a05822..880c1df 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ The required Qt DLLs as well as the encoder binaries are *included* with the app The minimum system requirements to run Simple x264/x265 Launcher are as follows: -* Windows XP with Service Pack 2 or any later Windows system – note that Windows XP is **not** recommended! +* Windows Vista with Service Pack 2 or any later Windows system – note that Windows XP is **not** supported anymore! * 64-Bit editions of Windows are highly recommended, though 32-Bit editions will work as well * The CPU must support at least the MMX and SSE instruction sets * Avisynth input only available with [Avisynth](http://avisynth.nl/index.php/Main_Page#Official_builds) **2.6** installed – Avisynth **2.5.x** is *not* recommended! diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi index e1d82c9..8b41c39 100644 --- a/etc/setup/setup.nsi +++ b/etc/setup/setup.nsi @@ -317,35 +317,21 @@ Function .onInit Quit ${EndIf} - # Running on Windows XP or later? - ${If} ${AtMostWin2000} - MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, but your operating system is *not* supported anymore.$\nInstallation will be aborted!$\n$\nThe minimum required platform is Windows XP (Service Pack 3)." + # Running on Windows Vista or later? + ${If} ${AtMostWinXP} + MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, but your operating system is *not* supported anymore.$\nInstallation will be aborted!$\n$\nThe minimum supported platform is Windows Vista (Service Pack 2)." ExecShell "open" "http://windows.microsoft.com/" Quit ${EndIf} - # If on Windows XP, is the required Service Pack installed? - ${If} ${IsWinXP} - ${IfNot} ${RunningX64} # Windows XP 32-Bit, requires Service Pack 3 - ${AndIf} ${AtMostServicePack} 2 - MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires Windows XP with Service Pack 3 installed.$\nWindows XP *without* Service Pack 3 reached end-of-life on 2010-07-13.$\nCurrent Windows XP (Service Pack 3) will be supported until 2014-04-08.$\n$\nPlease install Service Pack 3 now or just run Windows Update!" - ${If} ${Cmd} `MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 3 for Windows XP now?" IDYES` - ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=24" - ${Else} - ExecShell "open" "http://windowsupdate.microsoft.com/" - ${EndIf} - Quit - ${EndIf} - ${If} ${RunningX64} # Windows XP 64-Bit, requires Service Pack 2 - ${AndIf} ${AtMostServicePack} 1 - MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires Windows XP x64 Edition with Service Pack 2 installed.$\nWindows XP x64 Edition *without* Service Pack 2 reached end-of-life on 2009-04-14.$\nCurrent Windows XP x64 Edition (Service Pack 2) will be supported until 2014-04-08.$\n$\nPlease install Service Pack 2 now or just run Windows Update!" - ${If} ${Cmd} `MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 2 for Windows XP x64 Edition now?" IDYES` - ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=17791" - ${Else} - ExecShell "open" "http://windowsupdate.microsoft.com/" - ${EndIf} - Quit + # If on Windows Vista, is the required Service Pack installed? + ${If} ${IsWinVista} + ${AndIf} ${AtMostServicePack} 1 + MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires Windows Vista with Service Pack 2 installed." + ${If} ${Cmd} `MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 2 for Windows Vista now?" IDYES` + ExecShell "open" "https://www.microsoft.com/en-us/download/details.aspx?id=16468" ${EndIf} + Quit ${EndIf} ; --------