From 8535bfc0bf5dceef9f81d10a0900851938a2c315 Mon Sep 17 00:00:00 2001 From: BossHuso Date: Thu, 18 Feb 2021 14:55:09 -0800 Subject: [PATCH] music: Fix some NPEs --- .../client/plugins/music/MusicPlugin.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java index a8ef79401f..4fce105ff8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java @@ -557,11 +557,16 @@ public class MusicPlugin extends Plugin return; } - for (Widget w : track.getChildren()) + Widget[] trackChildren = track.getChildren(); + + if (trackChildren != null) { - if (w != null) + for (Widget w : trackChildren) { - w.setAction(0, null); + if (w != null) + { + w.setAction(0, null); + } } } @@ -588,7 +593,11 @@ public class MusicPlugin extends Plugin public void shutDown() { super.shutDown(); - handle.setSpriteId(SpriteID.SETTINGS_SLIDER_HANDLE_BLUE); + + if (this.handle != null) + { + handle.setSpriteId(SpriteID.SETTINGS_SLIDER_HANDLE_BLUE); + } this.icon.setOnOpListener((Object[]) null);