mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-26 14:37:44 +01:00
Merge pull request #29 from Cyberboss/DiscordDC
Fixes Discord client disconnecting improperly
This commit is contained in:
@@ -163,13 +163,25 @@ namespace TGServerService
|
||||
//noop
|
||||
}
|
||||
|
||||
void DisconnectAndDispose()
|
||||
{
|
||||
try
|
||||
{
|
||||
client.Disconnect().Wait();
|
||||
}
|
||||
catch (Exception e) {
|
||||
TGServerService.WriteLog("Discord failed DnD: " + e.ToString());
|
||||
}
|
||||
client.Dispose();
|
||||
}
|
||||
|
||||
public string SetProviderInfo(TGChatSetupInfo info)
|
||||
{
|
||||
try
|
||||
{
|
||||
lock (DiscordLock)
|
||||
{
|
||||
client.Dispose();
|
||||
DisconnectAndDispose();
|
||||
Init(info);
|
||||
if (Properties.Settings.Default.ChatEnabled)
|
||||
Connect();
|
||||
@@ -191,7 +203,7 @@ namespace TGServerService
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
client.Dispose();
|
||||
DisconnectAndDispose();
|
||||
// TODO: dispose managed state (managed objects).
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user