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

Merge pull request #6430 from Abextm/kill-login-panel

Browse Source 
ChatboxPanelManager: Kill panels when logging out.
This commit is contained in:
Tomas Slusny
2018-11-12 11:30:59 +01:00
committed by GitHub
parent 34c6e11a21 98f26edf7a
commit 0db132ad76
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java
View File

@@ -32,8 +32,10 @@ import com.google.inject.Singleton;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ScriptID; import net.runelite.api.ScriptID;
import net.runelite.api.VarClientInt; import net.runelite.api.VarClientInt;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.vars.InputType; import net.runelite.api.vars.InputType;
import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.JavaScriptCallback;
@@ -143,6 +145,21 @@ public class ChatboxPanelManager
public void onScriptCallbackEvent(ScriptCallbackEvent ev) public void onScriptCallbackEvent(ScriptCallbackEvent ev)
{ {
if (currentInput != null && "resetChatboxInput".equals(ev.getEventName())) if (currentInput != null && "resetChatboxInput".equals(ev.getEventName()))
{
killCurrentPanel();
}
}
@Subscribe
private void onGameStateChanged(GameStateChanged ev)
{
if (currentInput != null && ev.getGameState() == GameState.LOGIN_SCREEN)
{
killCurrentPanel();
}
}
private void killCurrentPanel()
{ {
try try
{ {
@@ -168,7 +185,6 @@ public class ChatboxPanelManager
} }
currentInput = null; currentInput = null;
} }
}
public Widget getContainerWidget() public Widget getContainerWidget()
{ {