fix #949 #942 extraTransaction().setCustomAnimations() exitAnimatio…

…n is not working
YoKeyword · Aug 14, 2018 · e43ead1 · e43ead1
1 parent b66a4eb
commit e43ead1
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/TransactionDelegate.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/TransactionDelegate.java
@@ -247,19 +247,23 @@ void pop(final FragmentManager fm) {
             @Override
             public void run() {
                 handleAfterSaveInStateTransactionException(fm, "pop()");
-                removeTopFragment(fm);
                 FragmentationMagician.popBackStackAllowingStateLoss(fm);
+                removeTopFragment(fm);
             }
         });
     }
 
     private void removeTopFragment(FragmentManager fm) {
-        ISupportFragment top = SupportHelper.getBackStackTopFragment(fm);
-        if (top != null) {
-            fm.beginTransaction()
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-                    .remove((Fragment) top)
-                    .commitAllowingStateLoss();
+        try { // Safe popBackStack()
+            ISupportFragment top = SupportHelper.getBackStackTopFragment(fm);
+            if (top != null) {
+                fm.beginTransaction()
+                        .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
+                        .remove((Fragment) top)
+                        .commitAllowingStateLoss();
+            }
+        } catch (Exception ignored) {
+
         }
     }