Fix to unify the call for applying commandline args into a single ent…

…ry point
DeNA · Nov 6, 2024 · 553c9a3 · 553c9a3
1 parent 51e7cae
commit 553c9a3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/Editor/Commandline.cs b/Editor/Commandline.cs
@@ -55,9 +55,6 @@ private static void Bootstrap()
             // Set first open Scene
             EditorSceneManager.playModeStartScene = myWantedStartScene;
 
-            // Apply commandline arguments
-            settings.OverwriteByCommandLineArguments(new Arguments());
-
             // Register event handler for terminate autopilot
             EditorApplication.playModeStateChanged += OnChangePlayModeState;
 

diff --git a/Runtime/Launcher.cs b/Runtime/Launcher.cs
@@ -96,9 +96,6 @@ private static void LaunchAutopilotOnPlayerFromCommandline()
                 throw new InvalidOperationException("Autopilot is already running");
             }
 
-            // Apply commandline arguments
-            settings.OverwriteByCommandLineArguments(new Arguments());
-
             state.launchFrom = LaunchType.Commandline;
             state.settings = settings;
         }

diff --git a/Runtime/Settings/ArgumentCapture/ArgumentCapture.cs b/Runtime/Settings/ArgumentCapture/ArgumentCapture.cs
@@ -21,10 +21,11 @@ internal static (bool, T) Capture<T>(string key, string[] args = null)
 
             if (string.IsNullOrEmpty(captureString))
             {
-                Debug.Log($"Argument not found. key: {key}");
                 return (false, default(T));
             }
 
+            Debug.Log($"Capture commandline argument: {key}");
+
             switch (typeof(T))
             {
                 case Type stringType when stringType == typeof(string):

diff --git a/Runtime/Settings/AutopilotSettings.cs b/Runtime/Settings/AutopilotSettings.cs
@@ -270,6 +270,8 @@ private static void Initialize()
             var settings = AutopilotState.Instance.settings;
             Assert.IsNotNull(settings);
 
+            settings.OverwriteByCommandLineArguments(new Arguments());
+
             settings.ConvertLoggersFromObsoleteLogger(); // Note: before create default logger.
             settings.CreateDefaultLoggerIfNeeded();
 

diff --git a/Tests/Runtime/AutopilotTest.cs b/Tests/Runtime/AutopilotTest.cs
@@ -69,6 +69,7 @@ public async Task Start_LoggerIsNotSet_UsingDefaultLogger()
             autopilotSettings.lifespanSec = 1;
 
             await Launcher.LaunchAutopilotAsync(autopilotSettings);
+            await UniTask.NextFrame(); // wait flushing log for subsequence tests
 
             LogAssert.Expect(LogType.Log, "Launched autopilot"); // using console logger
         }