epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash after entering manage content

Browse Source
This commit is contained in:
teinarss
2020-07-30 20:22:52 +02:00
committed by abcdefg30
parent 06fbc1a6cf
commit 544ac6cb33
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenRA.Mods.Common/DiscordService.cs
View File

@@ -32,16 +32,21 @@ namespace OpenRA.Mods.Common
public sealed class DiscordService : IGlobalModData, IDisposable
{
public readonly string ApplicationId = null;
readonly DiscordRpcClient client;
DiscordRpcClient client;
DiscordState currentState;
static readonly Lazy<DiscordService> Service = Exts.Lazy(() =>
static DiscordService instance;
static DiscordService GetService()
{
if (instance != null)
return instance;
if (!Game.ModData.Manifest.Contains<DiscordService>())
return null;
return Game.ModData.Manifest.Get<DiscordService>();
});
instance = Game.ModData.Manifest.Get<DiscordService>();
return instance;
}
public DiscordService(MiniYaml yaml)
{
@@ -90,7 +95,7 @@ namespace OpenRA.Mods.Common
if (currentState == state)
return;
if (Service.Value == null)
if (instance == null)
return;
string stateText;
@@ -164,20 +169,26 @@ namespace OpenRA.Mods.Common
public void Dispose()
{
if (client != null)
{
client.Dispose();
client = null;
instance = null;
}
}
public static void UpdateStatus(DiscordState state, string details = null, string secret = null, int? players = null, int? slots = null)
{
if (Service.Value != null)
Service.Value.SetStatus(state, details, secret, players, slots);
var service = GetService();
if (service != null)
service.SetStatus(state, details, secret, players, slots);
}
public static void SetPlayers(int players, int slots)
{
if (Service.Value != null)
var service = GetService();
if (service != null)
{
Service.Value.client.UpdateParty(new Party
service.client.UpdateParty(new Party
{
ID = Secrets.CreateFriendlySecret(new Random()),
Size = players,
@@ -188,14 +199,16 @@ namespace OpenRA.Mods.Common
public static void UpdatePlayers(int players, int slots)
{
if (Service.Value != null)
Service.Value.client.UpdatePartySize(players, slots);
var service = GetService();
if (service != null)
service.client.UpdatePartySize(players, slots);
}
public static void UpdateDetails(string details)
{
if (Service.Value != null)
Service.Value.client.UpdateDetails(details);
var service = GetService();
if (service != null)
service.client.UpdateDetails(details);
}
}
}