From f1b2b0df4a4fe83b66b6188b6ca31d834c196ff9 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 27 Oct 2018 20:28:38 +0200 Subject: [PATCH] Add back check for widget.isHidden() to TabInterface This check is still required, because in rare circumstances the bank widget is simply not nulled. Signed-off-by: Tomas Slusny --- .../plugins/banktags/tabs/TabInterface.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index f8b25cf7b0..62e22a8894 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -312,16 +312,22 @@ public class TabInterface public void handleWheel(final MouseWheelEvent event) { - if (isHidden()) + if (parent == null || !canvasBounds.contains(event.getPoint())) { return; } - if (canvasBounds.contains(event.getPoint())) + event.consume(); + + clientThread.invoke(() -> { - event.consume(); - clientThread.invoke(() -> scrollTab(event.getWheelRotation())); - } + if (isHidden()) + { + return; + } + + scrollTab(event.getWheelRotation()); + }); } public void handleAdd(MenuEntryAdded event) @@ -687,7 +693,7 @@ public class TabInterface private boolean isHidden() { Widget widget = client.getWidget(WidgetInfo.BANK_CONTAINER); - return !config.tabs() || widget == null; + return !config.tabs() || widget == null || widget.isHidden(); } private void loadTab(String tag)