Implemented NFC Card Reader Code from https://git.sterul.com/student-projects/dhbw...

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / fragments / PopupFragment.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java
index 69f36d580286c2859d9f3fe79f4ca41e3d1f981b..51058fe2920124abb39bf38dcd771cc8802b8b99 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java
@@ -67,9 +67,14 @@ public class PopupFragment extends DialogFragment {
 
     public void destroyView() {
         if(oCurrentFragment != null) {
-            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-            transaction.remove(oCurrentFragment);
-            transaction.commit();
+            CampusAppFragment fragment = oCurrentFragment;
+            oCurrentFragment = null;
+            if(fragment.isAdded()) {
+                FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+                transaction.remove(fragment);
+                transaction.commit();
+            } else
+                AppContext.getMainActivity().onBackPressed();
         }
     }