From: pk910 <philipp@pk910.de>
Date: Mon, 8 Feb 2016 09:05:17 +0000 (+0100)
Subject: fixed title for popups
X-Git-Url: http://git.pk910.de/?p=DHBWCampusApp.git;a=commitdiff_plain;h=89252e3c22caf6dcccd0c50ad3a9282a53b5a890

fixed title for popups
---

diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
index ab49c22..89cbc7c 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
@@ -114,7 +114,8 @@ public class CampusAppContext {
     public void setTitle(String title) {
         PopupFragment popup = oNavigationManager.getDialog();
         if(popup != null) {
-            popup.getDialog().setTitle(title);
+            if(popup.getDialog() != null)
+                popup.getDialog().setTitle(title);
         } else {
             TextView titleView = (TextView)oMainActivity.findViewById(R.id.title);
             titleView.setText(title);
diff --git a/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java b/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
index 4a168a2..daa84ea 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/NavigationManager.java
@@ -66,7 +66,8 @@ public class NavigationManager {
             return null;
         if(oCurrentPage.fragmentType != 3)
             return (CampusAppFragment)oCurrentFragment;
-        return null;
+        else
+            return ((PopupFragment)oCurrentFragment).getCurrentFragment();
     }
 
     public void navigatePage(String name) {