From a69fb175e95b6600b90b6c5c6fc68a77539cde00 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 26 Aug 2017 21:15:14 +0100
Subject: [PATCH] WinGui: Use ExecWait instead of Exec for the installer. This
 should prevent the install from continuing until the uninstall process has
 completed.

---
 win/CS/HandBrakeWPF/Installer/Installer.nsi     | 4 ++--
 win/CS/HandBrakeWPF/Installer/Installer64.nsi   | 4 ++--
 win/CS/HandBrakeWPF/Installer/MakeNightly.nsi   | 4 ++--
 win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 15f1b10e86ef..fdc8ea9a1c83 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -99,9 +99,9 @@ Function .onInit
  ;Run the uninstaller
   uninst:
    IfSilent +3
-   Exec $INSTDIR\uninst.exe
+   ExecWait $INSTDIR\uninst.exe
    goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$INSTDIR\uninst.exe" /S'
   done:
 FunctionEnd
 
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index f1a41a07a421..5b7538528d8d 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -99,9 +99,9 @@ Function .onInit
  ;Run the uninstaller
   uninst:
    IfSilent +3
-   Exec $INSTDIR\uninst.exe
+   ExecWait $INSTDIR\uninst.exe
    goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$INSTDIR\uninst.exe" /S'
   done:
 FunctionEnd
 
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 0d9f152351bc..4d19fff813af 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -99,9 +99,9 @@ Function .onInit
  ;Run the uninstaller
   uninst:
    IfSilent +3
-   Exec $INSTDIR\uninst.exe
+   ExecWait $INSTDIR\uninst.exe
    goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$INSTDIR\uninst.exe" /S'
   done:
 FunctionEnd
 
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index dc6d134eeb86..0c10bd7d3e8a 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -98,9 +98,9 @@ Function .onInit
  ;Run the uninstaller
   uninst:
    IfSilent +3
-   Exec $INSTDIR\uninst.exe
+   ExecWait $INSTDIR\uninst.exe
    goto done
-   Exec '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$INSTDIR\uninst.exe" /S'
   done:
 FunctionEnd