From 92ca1e6e0910178d82063e275dfd6e77c46de27e Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 3 Apr 2020 20:34:01 +0200
Subject: [PATCH] Check if already running before removing watched

---
 .../local/playlist/LocalPlaylistFragment.java        | 12 +++++-------
 1 file changed, 5 insertions(+), 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
index 0881c6b97..8e8ad44ec 100644
--- 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 class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     }
 
     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 class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                     }
 
                     hideLoading();
-                }, this::onError
-                );
+                }, this::onError);
     }
 
     @Override