From fcd17307840cb80ed4dc4ee9b3850c30c1470620 Mon Sep 17 00:00:00 2001
From: Martijn Brekhof <m.brekhof@gmail.com>
Date: Wed, 15 Mar 2017 19:49:38 +0100
Subject: [PATCH] Fixes NPE in ConnectionObserversManagerService.onDestroy
 (#372)

---
 .../kore/service/ConnectionObserversManagerService.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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<HostConnectionObserver.PlayerEventsObserver> mConnectionObservers;
+    private List<HostConnectionObserver.PlayerEventsObserver> 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");