From fd45a37c7b2504522f5faa63f70d0e6dbf36fa3f Mon Sep 17 00:00:00 2001
From: sweeneys <sweeneys@amazon.com>
Date: Wed, 1 Dec 2021 14:13:13 -0800
Subject: [PATCH] Restore defaults, clarify comment

Signed-off-by: sweeneys <sweeneys@amazon.com>
---
 .../launchers/platforms/android/launcher.py   |  2 +-
 .../launchers/platforms/linux/launcher.py     |  6 ++---
 .../launchers/platforms/win/launcher.py       | 22 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
index 7c3efd9e9d..9433f426b5 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/android/launcher.py
@@ -177,7 +177,7 @@ class AndroidLauncher(Launcher):
         if backupFiles:
             self.backup_settings()
 
-        # Base setup defaults to None
+        # None reverts to function default
         if launch_ap is None:
             launch_ap = True
 
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
index 96e827069e..377121f2e0 100644
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/linux/launcher.py
@@ -52,7 +52,7 @@ class LinuxLauncher(Launcher):
         if backupFiles:
             self.backup_settings()
 
-        # Base setup defaults to None
+        # None reverts to function default
         if launch_ap is None:
             launch_ap = True
 
@@ -192,9 +192,9 @@ class DedicatedLinuxLauncher(LinuxLauncher):
         if backupFiles:
             self.backup_settings()
 
-        # Base setup defaults to None
+        # None reverts to function default
         if launch_ap is None:
-            launch_ap = True
+            launch_ap = False
 
         super(DedicatedLinuxLauncher, self).setup(backupFiles, launch_ap, configure_settings)
 
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
index f989f7bd19..c29aa7b10b 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/win/launcher.py
@@ -52,7 +52,7 @@ class WinLauncher(Launcher):
         if backupFiles:
             self.backup_settings()
 
-        # Base setup defaults to None
+        # None reverts to function default
         if launch_ap is None:
             launch_ap = True
 
@@ -177,6 +177,26 @@ class WinLauncher(Launcher):
 
 class DedicatedWinLauncher(WinLauncher):
 
+    def setup(self, backupFiles=True, launch_ap=False, configure_settings=True):
+        """
+        Perform setup of this launcher, must be called before launching.
+        Subclasses should call its parent's setup() before calling its own code, unless it changes configuration files
+
+        :param backupFiles: Bool to backup setup files
+        :param launch_ap: Bool to launch the asset processor
+        :param configure_settings: Bool to update settings caches
+        :return: None
+        """
+        # Backup
+        if backupFiles:
+            self.backup_settings()
+
+        # None reverts to function default
+        if launch_ap is None:
+            launch_ap = False
+
+        super(DedicatedWinLauncher, self).setup(backupFiles, launch_ap, configure_settings)
+
     def binary_path(self):
         """
         Return full path to the dedicated server launcher for the build directory.