From 9c3a15e790e4bd7efd783ea8894ec598b7e796cf Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 27 Sep 2022 11:46:31 +0800
Subject: [PATCH] Fix crash bug

---
 .../java/com/fongmi/android/tv/ui/activity/CollectActivity.java | 1 -
 .../java/com/fongmi/android/tv/ui/fragment/CollectFragment.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index 8c0ac7f00..4f943dcca 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -98,7 +98,6 @@ public class CollectActivity extends BaseActivity {
     private void setViewModel() {
         mViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
         mViewModel.result.observe(this, result -> {
-            if (mExecutor == null) return;
             mAdapter.add(Collect.create(result.getList()));
             getFragment().addVideo(result.getList());
             mPageAdapter.notifyDataSetChanged();
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
index c3b547e2b..db71c8ea4 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
@@ -72,7 +72,7 @@ public class CollectFragment extends BaseFragment implements VodPresenter.OnClic
     }
 
     public void addVideo(List<Vod> items) {
-        if (checkLastSize(items)) return;
+        if (checkLastSize(items) || getActivity() == null || getActivity().isFinishing()) return;
         List<ListRow> rows = new ArrayList<>();
         for (List<Vod> part : Lists.partition(items, Prefers.getColumn())) {
             mLast = new ArrayObjectAdapter(new VodPresenter(this));