Removing dont destroy on load (#52)

* Removing Dont Destroy on Load in UserProfile
microsoft · May 16, 2017 · 24ca78b · 24ca78b
1 parent 0c615fe
commit 24ca78b
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Assets/Xbox Live/Scripts/UserProfile.cs b/Assets/Xbox Live/Scripts/UserProfile.cs
@@ -44,16 +44,23 @@ public void Awake()
         if (!instance)
         {
             instance = this;
+            XboxLiveUser.SignOutCompleted += this.XboxLiveUserOnSignOutCompleted;
+            if (XboxLiveComponent.Instance.User != null && XboxLiveComponent.Instance.User.IsSignedIn)
+            {
+                instance.User = XboxLiveComponent.Instance.User;
+                this.StartCoroutine(this.LoadProfileInfo());
+            }
+            else
+            {
+                this.profileInfoPanel.SetActive(false);
+            }
+
+            this.Refresh();
         }
         else
         {
             Destroy(this.gameObject);
         }
-
-        this.profileInfoPanel.SetActive(false);
-        XboxLiveUser.SignOutCompleted += this.XboxLiveUserOnSignOutCompleted;
-        DontDestroyOnLoad(this.gameObject);
-        this.Refresh();
     }
 
     public void Start()