Check if already running before removing watched

TeamNewPipe · Apr 3, 2020 · 92ca1e6 · 92ca1e6
1 parent 6571fdb
commit 92ca1e6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -369,12 +369,11 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     }
 
     public void removeWatchedStreams() {
-        showLoading();
-
-        if (removeWatchedDisposable != null) {
-            // In case this is called twice
-            removeWatchedDisposable.dispose();
+        if (removeWatchedDisposable != null && !removeWatchedDisposable.isDisposed()) {
+            // already running
+            return;
         }
+        showLoading();
 
         removeWatchedDisposable = Flowable.just(
                 playlistManager.getPlaylistStreams(playlistId).blockingFirst())
@@ -431,8 +430,7 @@ public void removeWatchedStreams() {
                     }
 
                     hideLoading();
-                }, this::onError
-                );
+                }, this::onError);
     }
 
     @Override