From 7effa9ee50739c3085a92a31fb5bcac029bfc13b Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 4 Aug 2018 19:48:25 +0200 Subject: [PATCH] Add null-check for game canvas If frame is opened too fast and game did not managed to create the canvas yet, frame will crash during startup on NPE. Signed-off-by: Tomas Slusny --- .../main/java/net/runelite/client/ui/ClientUI.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 22424d4f74..64e54158ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -514,8 +514,12 @@ public class ClientUI { if (client instanceof Client) { - final java.awt.Point point = SwingUtilities.convertPoint(((Client) client).getCanvas(), 0, 0, frame); - return new Point(point.x, point.y); + final Canvas canvas = ((Client) client).getCanvas(); + if (canvas != null) + { + final java.awt.Point point = SwingUtilities.convertPoint(canvas, 0, 0, frame); + return new Point(point.x, point.y); + } } return new Point(0, 0); @@ -646,7 +650,10 @@ public class ClientUI if (client instanceof Client) { final Canvas c = ((Client) client).getCanvas(); - c.requestFocusInWindow(); + if (c != null) + { + c.requestFocusInWindow(); + } } else if (client != null) {