diff --git a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java index 64dd2bc08..9eb45cf0c 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java @@ -139,6 +139,7 @@ public class LiveViewModel extends ViewModel { Future oldFuture = futures.get(type); if (oldFuture != null && !oldFuture.isDone()) oldFuture.cancel(true); Future newFuture = App.submit(callable); + if (executor.isShutdown()) return; futures.put(type, newFuture); executor.execute(() -> { try { diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index d176845ab..cc21262d0 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -256,6 +256,7 @@ public class SiteViewModel extends ViewModel { private void execute(MutableLiveData result, Callable callable) { if (future != null && !future.isDone()) future.cancel(true); + if (executor.isShutdown()) return; future = App.submit(callable); executor.execute(() -> { try {