fix manager non-initialization bug.

2016-11-12 02:05:09 +09:00
parent 0e205ecef7
commit e4e4917bcb
2 changed files with 20 additions and 15 deletions
@@ -11,21 +11,7 @@ public class Manager : MonoBehaviour
    private static Manager instance_;
    public static Manager instance 
    {
-        get 
-        { 
-            if (instance_) {
-                return instance_;
-            }
-
-            var manager = FindObjectOfType<Manager>();
-            if (manager) {
-                manager.Awake();
-                return manager;
-            }
-
-            var go = new GameObject("uDesktopDuplicationManager");
-            return go.AddComponent<Manager>();
-        }
+        get { return CreateInstance(); }
    }

    private List<Monitor> monitors_ = new List<Monitor>();
@@ -63,6 +49,22 @@ public class Manager : MonoBehaviour
    public delegate void ReinitializeHandler();
    public static event ReinitializeHandler onReinitialized;

+    public static Manager CreateInstance()
+    {
+        if (instance_) {
+            return instance_;
+        }
+
+        var manager = FindObjectOfType<Manager>();
+        if (manager) {
+            manager.Awake();
+            return manager;
+        }
+
+        var go = new GameObject("uDesktopDuplicationManager");
+        return go.AddComponent<Manager>();
+    }
+
    void Awake()
    {
        Lib.SetDebugMode(debugMode);