From 6ee8ebbadc41c2d02032a54a120b2c92f8b00867 Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Mon, 1 Nov 2021 18:24:14 +0100
Subject: [PATCH 1/2] Disable run client for install without driver

---
 windows/installer.nsi | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/windows/installer.nsi b/windows/installer.nsi
index 1c739aeed8..fd783a487e 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -125,6 +125,7 @@ Var Label
 
 Var bInstallDtIcon
 Var bRunApp
+Var bShowRunAppOption
 
 ; Installer
 
@@ -328,6 +329,9 @@ Function .onInit
     IfErrors   0 +2
     StrCpy $bInstallDtIcon "1"
 
+    ; Enable to show the run app after install option, can be disabled when no audio driver detected
+    StrCpy $bShowRunAppOption "1"
+
     ; Select installer language
     !insertmacro MUI_LANGDLL_DISPLAY
 
@@ -363,7 +367,7 @@ Function FinishPage.Show ; set the user choices if they were remembered
         SendMessage $mui.FinishPage.Run ${BM_SETCHECK} ${BST_UNCHECKED} 0
     ${EndIf}
 
-    ShowWindow $mui.FinishPage.Run 1
+    ShowWindow $mui.FinishPage.Run $bShowRunAppOption  ; option will only be displayed if an audio driver was detected during install
 
 FunctionEnd
 
@@ -413,6 +417,8 @@ FunctionEnd
             MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(JACK_EXIT_NO_DRIVER)" /sd IDNO IDYES SkipMessage
                 Abort
        SkipMessage:
+            StrCpy $bRunApp "0"           ; set the app not to run after install as there is no audio driver
+            StrCpy $bShowRunAppOption "0" ; do not show the run the app option in the finish page
 
     FunctionEnd
 !else
@@ -453,6 +459,8 @@ FunctionEnd
             MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(ASIO_EXIT_NO_DRIVER)" /sd IDNO IDYES SkipMessage
                 Abort
        SkipMessage:
+            StrCpy $bRunApp "0"           ; set the app not to run after install as there is no audio driver
+            StrCpy $bShowRunAppOption "0" ; do not show the run the app option in the finish page
 
     FunctionEnd
 !endif

From f20f0dd9032d271259f051053e15ca8e0ebab8d6 Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Sun, 5 Dec 2021 13:15:27 +0100
Subject: [PATCH 2/2] update to keep option in window

---
 windows/installer.nsi | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/windows/installer.nsi b/windows/installer.nsi
index fd783a487e..2918593613 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -125,7 +125,6 @@ Var Label
 
 Var bInstallDtIcon
 Var bRunApp
-Var bShowRunAppOption
 
 ; Installer
 
@@ -329,9 +328,6 @@ Function .onInit
     IfErrors   0 +2
     StrCpy $bInstallDtIcon "1"
 
-    ; Enable to show the run app after install option, can be disabled when no audio driver detected
-    StrCpy $bShowRunAppOption "1"
-
     ; Select installer language
     !insertmacro MUI_LANGDLL_DISPLAY
 
@@ -367,7 +363,7 @@ Function FinishPage.Show ; set the user choices if they were remembered
         SendMessage $mui.FinishPage.Run ${BM_SETCHECK} ${BST_UNCHECKED} 0
     ${EndIf}
 
-    ShowWindow $mui.FinishPage.Run $bShowRunAppOption  ; option will only be displayed if an audio driver was detected during install
+    ShowWindow $mui.FinishPage.Run 1
 
 FunctionEnd
 
@@ -417,8 +413,7 @@ FunctionEnd
             MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(JACK_EXIT_NO_DRIVER)" /sd IDNO IDYES SkipMessage
                 Abort
        SkipMessage:
-            StrCpy $bRunApp "0"           ; set the app not to run after install as there is no audio driver
-            StrCpy $bShowRunAppOption "0" ; do not show the run the app option in the finish page
+            StrCpy $bRunApp "0" ; set the run app after install option to unchecked as there is no audio driver
 
     FunctionEnd
 !else
@@ -459,8 +454,7 @@ FunctionEnd
             MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(ASIO_EXIT_NO_DRIVER)" /sd IDNO IDYES SkipMessage
                 Abort
        SkipMessage:
-            StrCpy $bRunApp "0"           ; set the app not to run after install as there is no audio driver
-            StrCpy $bShowRunAppOption "0" ; do not show the run the app option in the finish page
+            StrCpy $bRunApp "0" ; set the run app after install option to unchecked as there is no audio driver
 
     FunctionEnd
 !endif