diff --git a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java index 131e9b1..bc07c64 100644 --- a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java +++ b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java @@ -49,7 +49,7 @@ public class ConnectionObserversManagerService extends Service private HostConnectionObserver mHostConnectionObserver = null; - private List mConnectionObservers; + private List mConnectionObservers = new ArrayList<>(); @Override public void onCreate() { @@ -127,10 +127,8 @@ public class ConnectionObserversManagerService extends Service @Override public void onTaskRemoved (Intent rootIntent) { // Gracefully stop - if (mConnectionObservers != null) { - for (HostConnectionObserver.PlayerEventsObserver observer : mConnectionObservers) { - observer.playerOnConnectionError(0, "Task removed"); - } + for (HostConnectionObserver.PlayerEventsObserver observer : mConnectionObservers) { + observer.playerOnConnectionError(0, "Task removed"); } LogUtils.LOGD(TAG, "Shutting down observer service - Task removed");