X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FPopupFragment.java;h=216af461e337057e241b1dd66bd77da503e7f56b;hb=48e758721a39298a85c69ecc7267f3daf6993e78;hp=69f36d580286c2859d9f3fe79f4ca41e3d1f981b;hpb=a0f644715b43af1e4acf2513b972c3f980efdaca;p=DHBWCampusApp.git

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 69f36d5..216af46 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/PopupFragment.java
@@ -1,5 +1,19 @@
+/* PopupFragment.java
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package de.dhbwloe.campusapp.fragments;
-
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -67,9 +81,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();
         }
     }