add null check to playerNotificationManager and player on Destroy

2018-12-31 14:50:52 +08:00 · 2018-12-31 14:50:52 +08:00 · b21b4e945d
parent 55f2c07321
commit b21b4e945d
1 changed files with 7 additions and 5 deletions
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@ -118,11 +118,13 @@ public class VideoPlayerService extends Service {
    public void onDestroy() {

        Log.v(TAG, "onDestroy...");
-
-        playerNotificationManager.setPlayer(null);
-        player.release();
-        player = null;
-
+        if (playerNotificationManager != null) {
+            playerNotificationManager.setPlayer(null);
+        }
+        if (player != null) {
+            player.release();
+            player = null;
+        }
        super.onDestroy();
    }