From 75ed7e9215ba88358d9b838dd82fa3841f78ae5a Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 8 May 2017 11:31:20 -0400
Subject: Fix softlocks on pre-user OOBE.

---
 ShiftOS_TheReturn/SaveSystem.cs  |  2 +-
 ShiftOS_TheReturn/UniteClient.cs | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'ShiftOS_TheReturn')

diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index e635a7a..31db58a 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -131,7 +131,7 @@ namespace ShiftOS.Engine
                     try
                     {
                         
-                        ServerManager.Initiate("secondary4162.cloudapp.net", 13370);
+                        ServerManager.Initiate(UserConfig.Get().DigitalSocietyAddress, UserConfig.Get().DigitalSocietyPort);
                         //This haults the client until the connection is successful.
                         while (ServerManager.thisGuid == new Guid())
                         {
diff --git a/ShiftOS_TheReturn/UniteClient.cs b/ShiftOS_TheReturn/UniteClient.cs
index 1136b5c..8d6a58d 100644
--- a/ShiftOS_TheReturn/UniteClient.cs
+++ b/ShiftOS_TheReturn/UniteClient.cs
@@ -5,13 +5,20 @@ using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using ShiftOS.Objects;
 
 namespace ShiftOS.Unite
 {
     public class UniteClient
     {
         public string Token { get; private set; }
-        public string BaseURL { get; private set; }
+        public string BaseURL
+        {
+            get
+            {
+                return UserConfig.Get().UniteUrl;
+            }
+        }
 
         public string GetDisplayNameId(string id)
         {
@@ -25,7 +32,8 @@ namespace ShiftOS.Unite
 
         public UniteClient(string baseurl, string usertoken)
         {
-            BaseURL = baseurl;
+            //Handled by the servers.json file
+            //BaseURL = baseurl;
             Token = usertoken;
         }
 
-- 
cgit v1.2.3