From 475b4c0df09d531e0b81d92bb6c73cc34c99e1aa Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Tue, 4 Nov 2025 00:58:02 +0800
Subject: [PATCH] Fix crash

---
 app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java | 1 +
 app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java | 1 +
 2 files changed, 2 insertions(+)

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<T> 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> result, Callable<Result> callable) {
         if (future != null && !future.isDone()) future.cancel(true);
+        if (executor.isShutdown()) return;
         future = App.submit(callable);
         executor.execute(() -> {
             try {