From 5caec39cc67e6ce69be9077342f2683ec63984de Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Thu, 6 Aug 2020 01:28:58 -0400 Subject: [PATCH 1/3] Disable having the console be set to auto start with the PC as a default checked state. --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8e621b8f2d..5c45a6019a 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -887,7 +887,7 @@ Function PostInstallOptionsPage IntOp $CurrentOffset $CurrentOffset + 15 ; set the checkbox state depending on what is present in the registry - !insertmacro SetInstallOption $ConsoleStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED} + !insertmacro SetInstallOption $ConsoleStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_UNCHECKED} ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)" Pop $CleanInstallCheckbox @@ -940,7 +940,7 @@ Function ReadInstallTypes StrCpy $Express "1" StrCpy $DesktopClientState ${BST_CHECKED} - StrCpy $ConsoleStartupState ${BST_CHECKED} + StrCpy $ConsoleStartupState ${BST_UNCHECKED} StrCpy $LaunchConsoleNowState ${BST_CHECKED} StrCpy $LaunchClientNowState ${BST_CHECKED} StrCpy $CleanInstallState ${BST_UNCHECKED} From 8061c5ab8d665953aeb92a46be8c931e7c5c2b70 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 6 Aug 2020 22:30:06 +1200 Subject: [PATCH 2/3] Default not to start up Sandbox after install --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 5c45a6019a..6c53f3d49e 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -871,7 +871,7 @@ Function PostInstallOptionsPage Pop $LaunchConsoleNowCheckbox ; set the checkbox state depending on what is present in the registry - !insertmacro SetInstallOption $LaunchConsoleNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED} + !insertmacro SetInstallOption $LaunchConsoleNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_UNCHECKED} ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE ${IfNot} $substringResult == "" ${NSD_SetState} $LaunchConsoleNowCheckbox ${BST_UNCHECKED} @@ -942,7 +942,7 @@ Function ReadInstallTypes StrCpy $DesktopClientState ${BST_CHECKED} StrCpy $ConsoleStartupState ${BST_UNCHECKED} StrCpy $LaunchConsoleNowState ${BST_CHECKED} - StrCpy $LaunchClientNowState ${BST_CHECKED} + StrCpy $LaunchClientNowState ${BST_UNCHECKED} StrCpy $CleanInstallState ${BST_UNCHECKED} StrCpy $DesktopConsoleState ${BST_UNCHECKED} From 04653c27464546b928ad8168163e956d86ab2b2c Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Aug 2020 10:34:07 +1200 Subject: [PATCH 3/3] Fix default Interface and Sandbox startup --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 6c53f3d49e..fe0d95e8b1 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -941,8 +941,8 @@ Function ReadInstallTypes StrCpy $DesktopClientState ${BST_CHECKED} StrCpy $ConsoleStartupState ${BST_UNCHECKED} - StrCpy $LaunchConsoleNowState ${BST_CHECKED} - StrCpy $LaunchClientNowState ${BST_UNCHECKED} + StrCpy $LaunchConsoleNowState ${BST_UNCHECKED} + StrCpy $LaunchClientNowState ${BST_CHECKED} StrCpy $CleanInstallState ${BST_UNCHECKED} StrCpy $DesktopConsoleState ${BST_UNCHECKED}