From 5191907af0f5abfcb45b6dcb09cc56a8924ce5db Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sun, 11 Aug 2019 22:10:05 +0200
Subject: [PATCH] Fix player resume

---
 .../org/schabi/newpipe/player/BasePlayer.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 46e7c1fdc..62be71995 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -187,6 +187,7 @@ public abstract class BasePlayer implements
     protected MediaSessionManager mediaSessionManager;
 
     private boolean isPrepared = false;
+    private Disposable stateLoader;
 
     //////////////////////////////////////////////////////////////////////////*/
 
@@ -283,16 +284,14 @@ public abstract class BasePlayer implements
                 ) {
             simpleExoPlayer.seekTo(playQueue.getIndex(), queue.getItem().getRecoveryPosition());
             return;
+
         } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false) && isPlaybackResumeEnabled()) {
             final PlayQueueItem item = queue.getItem();
-            if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET && isPlaybackResumeEnabled()) {
-                final Disposable stateLoader = recordManager.loadStreamState(item)
+            if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
+                stateLoader = recordManager.loadStreamState(item)
                         .observeOn(AndroidSchedulers.mainThread())
-                        .doFinally(() -> {
-                            if (simpleExoPlayer == null) return; // doFinally called while closing
-                            initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
-                                    /*playOnInit=*/true);
-                        })
+                        .doFinally(() -> initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
+                                /*playOnInit=*/true))
                         .subscribe(
                                 state -> queue.setRecovery(queue.getIndex(), state.getProgressTime()),
                                 error -> {
@@ -334,13 +333,13 @@ public abstract class BasePlayer implements
             simpleExoPlayer.removeListener(this);
             simpleExoPlayer.stop();
             simpleExoPlayer.release();
-            simpleExoPlayer = null;
         }
         if (isProgressLoopRunning()) stopProgressLoop();
         if (playQueue != null) playQueue.dispose();
         if (audioReactor != null) audioReactor.dispose();
         if (playbackManager != null) playbackManager.dispose();
         if (mediaSessionManager != null) mediaSessionManager.dispose();
+        if (stateLoader != null) stateLoader.dispose();
 
         if (playQueueAdapter != null) {
             playQueueAdapter.unsetSelectedListener();