WinGui: Use ExecWait instead of Exec for the installer. This should p…

…revent the install from continuing until the uninstall process has completed.
HandBrake · Aug 26, 2017 · a69fb17 · a69fb17
1 parent 4fea60e
commit a69fb17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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