ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

twitch: fix race in connect establishing multiple connections

Browse Source
This commit is contained in:
Adam
2019-03-20 09:13:52 -04:00
parent be1a7953fa
commit 9249129383
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java
View File

@@ -96,7 +96,7 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput
return configManager.getConfig(TwitchConfig.class); return configManager.getConfig(TwitchConfig.class);
} }
private void connect() private synchronized void connect()
{ {
if (twitchConfig.username() != null if (twitchConfig.username() != null
&& twitchConfig.oauthToken() != null && twitchConfig.oauthToken() != null
@@ -108,6 +108,13 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput
channel = "#" + channel; channel = "#" + channel;
} }
log.debug("Connecting to Twitch as {}", twitchConfig.username());
if (twitchIRCClient != null)
{
twitchIRCClient.close();
}
twitchIRCClient = new TwitchIRCClient( twitchIRCClient = new TwitchIRCClient(
this, this,
twitchConfig.username(), twitchConfig.username(),
@@ -145,12 +152,6 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput
return; return;
} }
if (twitchIRCClient != null)
{
twitchIRCClient.close();
twitchIRCClient = null;
}
connect(); connect();
} }