Address Morgan's feedback

Pauliusd01 · Pauliusd01 · commit d5d8b128f372 · 2026-04-07T16:12:08.000+03:00
diff --git a/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs b/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs
@@ -151,7 +151,7 @@ static void SetupEventSystem()
         var activeScene = SceneManager.GetActiveScene();
         bool hasSceneES = false;
 
-        foreach (var es in FindObjectsByType<EventSystem>(FindObjectsSortMode.None))
+        foreach (var es in FindObjectsByType<EventSystem>(FindObjectsInactive.Exclude))
         {
             if (es.gameObject.scene == activeScene)
             {
@@ -226,7 +226,7 @@ void DiscoverScenes()
     static bool IsExcluded(string path)
     {
         for (int i = 0; i < kExcludedSegments.Length; i++)
-            if (path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0) return true;
+            if (kExcludedSegments[i].Length > 0 && path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0) return true;
         for (int i = 0; i < kExcludedRoots.Length; i++)
             if (path.StartsWith(kExcludedRoots[i], StringComparison.OrdinalIgnoreCase)) return true;
         return false;
diff --git a/Assets/Tools/AddScenesToBuild.cs b/Assets/Tools/AddScenesToBuild.cs
@@ -92,7 +92,7 @@ static void RefreshBuildScenes(bool silent)
     static bool IsExcluded(string path)
     {
         for (int i = 0; i < kExcludedSegments.Length; i++)
-            if (path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0)
+            if (kExcludedSegments[i].Length > 0 && path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0)
                 return true;
         for (int i = 0; i < kExcludedRoots.Length; i++)
             if (path.StartsWith(kExcludedRoots[i], StringComparison.OrdinalIgnoreCase))

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ static void SetupEventSystem()`
`151`	`151`	`var activeScene = SceneManager.GetActiveScene();`
`152`	`152`	`bool hasSceneES = false;`
`153`	`153`
`154`		`- foreach (var es in FindObjectsByType<EventSystem>(FindObjectsSortMode.None))`
	`154`	`+ foreach (var es in FindObjectsByType<EventSystem>(FindObjectsInactive.Exclude))`
`155`	`155`	`{`
`156`	`156`	`if (es.gameObject.scene == activeScene)`
`157`	`157`	`{`
`@@ -226,7 +226,7 @@ void DiscoverScenes()`
`226`	`226`	`static bool IsExcluded(string path)`
`227`	`227`	`{`
`228`	`228`	`for (int i = 0; i < kExcludedSegments.Length; i++)`
`229`		`- if (path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0) return true;`
	`229`	`+ if (kExcludedSegments[i].Length > 0 && path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0) return true;`
`230`	`230`	`for (int i = 0; i < kExcludedRoots.Length; i++)`
`231`	`231`	`if (path.StartsWith(kExcludedRoots[i], StringComparison.OrdinalIgnoreCase)) return true;`
`232`	`232`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static void RefreshBuildScenes(bool silent)`
`92`	`92`	`static bool IsExcluded(string path)`
`93`	`93`	`{`
`94`	`94`	`for (int i = 0; i < kExcludedSegments.Length; i++)`
`95`		`- if (path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0)`
	`95`	`+ if (kExcludedSegments[i].Length > 0 && path.IndexOf(kExcludedSegments[i], StringComparison.OrdinalIgnoreCase) >= 0)`
`96`	`96`	`return true;`
`97`	`97`	`for (int i = 0; i < kExcludedRoots.Length; i++)`
`98`	`98`	`if (path.StartsWith(kExcludedRoots[i], StringComparison.OrdinalIgnoreCase))`