Merge pull request #4130 from Stypox/swipe-queueitem-fix

[regression] Close player in onPlaybackShutdown()
TeamNewPipe · Aug 15, 2020 · 13c9096 · 13c9096
2 parents 5ef407d + 12ac5ef
commit 13c9096
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 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
@@ -1068,14 +1068,6 @@ protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
         registerView();
     }
 
-    @Override
-    public void onPlaybackShutdown() {
-        if (DEBUG) {
-            Log.d(TAG, "Shutting down...");
-        }
-        destroy();
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // General Player
     //////////////////////////////////////////////////////////////////////////*/

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -622,7 +622,7 @@ public void onPlaybackShutdown() {
         if (DEBUG) {
             Log.d(TAG, "onPlaybackShutdown() called");
         }
-        // Override it because we don't want playerImpl destroyed
+        service.onDestroy();
     }
 
     @Override