CoroutineUtil Instance fix

Author: Singtaa

Runtime/Dom/Dom.cs

@@ -522,4 +522,4 @@ struct TickBasedCallTracker {
             public int count;
         }
     }
-}
+}

Runtime/Dom/Elements/Flipbook.cs

@@ -10,8 +10,8 @@ public class Flipbook : Image {
         public object src {
             get { return _src; }
             set {
-                if (value is Texture2D) {
-                    _texture = (Texture2D)value;
+                if (value is Texture2D tex) {
+                    _texture = tex;
                     this.image = _texture;
                     Reset();
                 }
@@ -67,6 +67,8 @@ public Flipbook() {
         }
 
         void Reset() {
+            if (_texture == null)
+                return;
             _index = 0;
             _cellWidth = _texture.width / _numPerRow;
             _cellHeight = _texture.height / Math.Max(1, _count / _numPerRow);
@@ -76,7 +78,8 @@ void Reset() {
         }
 
         void Animate() {
-            this.sourceRect = new Rect((_index % _numPerRow) * _cellWidth, (_index / _numPerRow) * _cellHeight,
+            this.sourceRect = new Rect((_index % _numPerRow) * _cellWidth,
+                (_index / _numPerRow) * _cellHeight,
                 _cellWidth, _cellHeight);
             if (_randomRotation && _index == 0) {
                 this.style.rotate = new StyleRotate(new Rotate(new Angle(Random.Range(0, 360f))));
@@ -87,4 +90,4 @@ void Animate() {
             CoroutineUtil.Start(_currentCo);
         }
     }
-}
+}

Runtime/Utils/CoroutineUtil.cs

@@ -4,23 +4,28 @@
 
 namespace OneJS.Utils {
     public class CoroutineUtil : MonoBehaviour {
-        public static CoroutineUtil Instance => instance;
-        static CoroutineUtil instance;
-
-        void Awake() {
-            instance = this;
+        public static CoroutineUtil Instance {
+            get {
+                if (instance == null) {
+                    var go = new GameObject("CoroutineUtil");
+                    DontDestroyOnLoad(go);
+                    instance = go.AddComponent<CoroutineUtil>();
+                }
+                return instance;
+            }
         }
+        static CoroutineUtil instance;
 
         public static void Start(IEnumerator routine) {
-            instance.StartCoroutine(routine);
+            Instance.StartCoroutine(routine);
         }
 
         public static void Stop(IEnumerator routine) {
-            instance.StopCoroutine(routine);
+            Instance.StopCoroutine(routine);
         }
 
         public static void StopAll() {
-            instance.StopAllCoroutines();
+            Instance.StopAllCoroutines();
         }
 
         /**
@@ -34,7 +39,7 @@ public static void StopAll() {
         */
         public static IEnumerator Chain(params IEnumerator[] actions) {
             foreach (IEnumerator action in actions) { // <- this foreach may be source of mem leaks
-                yield return instance.StartCoroutine(action);
+                yield return Instance.StartCoroutine(action);
             }
         }
 
@@ -82,4 +87,4 @@ public static IEnumerator Do(Action action) {
             yield return 0;
         }
     }
-}
+}