diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java index a8351db7..f31493d1 100644 --- a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java +++ b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java @@ -266,7 +266,8 @@ public RandomPlay getRandomPlay(Player player) { // For menu updates sent from LMS, handling of archived nodes needs testing! void menuStatusEvent(MenuStatusMessage event) { - if (event.playerId.equals(getActivePlayer().getId())) { + Player activePlayer = getActivePlayer(); + if (activePlayer != null && event.playerId.equals(activePlayer.getId())) { mHomeMenuHandling.handleMenuStatusEvent(event); } }