diff options
| author | Michael <[email protected]> | 2017-05-08 11:31:20 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-05-08 11:31:29 -0400 |
| commit | 75ed7e9215ba88358d9b838dd82fa3841f78ae5a (patch) | |
| tree | e976fbb38056e38fcd8393c3efcfe3db12f3c4b0 /ShiftOS_TheReturn/UniteClient.cs | |
| parent | 4a5db39ea7c0b9be342261ab416dbb5edf50b2ce (diff) | |
| download | shiftos_thereturn-75ed7e9215ba88358d9b838dd82fa3841f78ae5a.tar.gz shiftos_thereturn-75ed7e9215ba88358d9b838dd82fa3841f78ae5a.tar.bz2 shiftos_thereturn-75ed7e9215ba88358d9b838dd82fa3841f78ae5a.zip | |
Fix softlocks on pre-user OOBE.
Diffstat (limited to 'ShiftOS_TheReturn/UniteClient.cs')
| -rw-r--r-- | ShiftOS_TheReturn/UniteClient.cs | 12 |
1 files changed, 10 insertions, 2 deletions
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; } |
