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

Add null-check for game canvas

Browse Source 
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 <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-08-04 19:48:25 +02:00
parent 46c2745374
commit 7effa9ee50
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -514,9 +514,13 @@ public class ClientUI
{ {
if (client instanceof Client) if (client instanceof Client)
{ {
final java.awt.Point point = SwingUtilities.convertPoint(((Client) client).getCanvas(), 0, 0, frame); 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(point.x, point.y);
} }
}
return new Point(0, 0); return new Point(0, 0);
} }
@@ -646,8 +650,11 @@ public class ClientUI
if (client instanceof Client) if (client instanceof Client)
{ {
final Canvas c = ((Client) client).getCanvas(); final Canvas c = ((Client) client).getCanvas();
if (c != null)
{
c.requestFocusInWindow(); c.requestFocusInWindow();
} }
}
else if (client != null) else if (client != null)
{ {
client.requestFocusInWindow(); client.requestFocusInWindow();