- make sure we can find the fragment in the stack before we set it

ncapdevi · Nov 16, 2017 · f934f81 · f934f81
1 parent 001e161
commit f934f81
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java b/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java
@@ -608,9 +608,13 @@ public Fragment getCurrentFrag() {
         //if not, try to pull it from the stack
         Stack<Fragment> fragmentStack = mFragmentStacks.get(mSelectedTabIndex);
         if (!fragmentStack.isEmpty()) {
-            mCurrentFrag = mFragmentManager.findFragmentByTag(mFragmentStacks.get(mSelectedTabIndex).peek().getTag());
+            Fragment fragmentByTag = mFragmentManager.findFragmentByTag(mFragmentStacks.get(mSelectedTabIndex).peek().getTag());
+            if (fragmentByTag != null) {
+                mCurrentFrag = fragmentByTag;
+            }
         }
 
+
         return mCurrentFrag;
     }