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

[regression] Close player in onPlaybackShutdown()

app/src/main/java/org/schabi/newpipe/player/BasePlayer.java

@@ -1068,14 +1068,6 @@ public abstract class BasePlayer implements
         registerView();
     }
 
-    @Override
-    public void onPlaybackShutdown() {
-        if (DEBUG) {
-            Log.d(TAG, "Shutting down...");
-        }
-        destroy();
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // General Player
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java

@@ -622,7 +622,7 @@ public class VideoPlayerImpl extends VideoPlayer
         if (DEBUG) {
             Log.d(TAG, "onPlaybackShutdown() called");
         }
-        // Override it because we don't want playerImpl destroyed
+        service.onDestroy();
     }
 
     @Override