Avoid loading collection if finishing() == true

This was proposed as a fix for #4987 but that issue is being fixed in a defense-in-depth fashion as this is a threading change and harder to reason about
ankidroid · Sep 27, 2018 · 646be33 · 646be33
1 parent 646de85
commit 646be33
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
@@ -822,8 +822,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         View mainView = findViewById(android.R.id.content);
         initNavigationDrawer(mainView);
-        // Open collection asynchronously
-        startLoadingCollection();
+        // Open collection asynchronously unless our sub-class signaled they need to end
+        if (!isFinishing()) {
+            startLoadingCollection();
+        }
     }
 
     protected int getContentViewAttr(int fullscreenMode) {