Merge pull request #395 from kroonhorstdino/diagnostics_helper_null_c…

…heck Diagnostics helper null check
Cysharp · Sep 30, 2022 · e999268 · e999268
2 parents 8300c1b + 3f8e43b
commit e999268
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/PlayerLoopHelper.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/PlayerLoopHelper.cs
@@ -524,6 +524,14 @@ public static void DumpCurrentPlayerLoop()
             {
                 sb.AppendFormat("------{0}------", header.type.Name);
                 sb.AppendLine();
+
+                if (header.subSystemList is null) 
+                {
+                    sb.AppendFormat("{0} has no subsystems!", header.ToString());
+                    sb.AppendLine();
+                    continue;
+                }
+
                 foreach (var subSystem in header.subSystemList)
                 {
                     sb.AppendFormat("{0}", subSystem.type.Name);
@@ -545,6 +553,11 @@ public static bool IsInjectedUniTaskPlayerLoop()
 
             foreach (var header in playerLoop.subSystemList)
             {
+                if (header.subSystemList is null) 
+                { 
+                    continue;
+                }
+
                 foreach (var subSystem in header.subSystemList)
                 {
                     if (subSystem.type == typeof(UniTaskLoopRunners.UniTaskLoopRunnerInitialization))