Merge pull request #1221 from mfietz/issue/1220-preference-controller-NPE

Fix PreferenceActivity NPE

1 files changed, 6 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 133436b6f..fe94d82a1 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -102,13 +102,17 @@ public class PreferenceActivity extends ActionBarActivity {
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.preferences);
-            instance.preferenceController.onCreate();
+            if(instance.preferenceController != null) {
+                instance.preferenceController.onCreate();
+            }
         }
 
         @Override
         public void onResume() {
             super.onResume();
-            instance.preferenceController.onResume();
+            if(instance.preferenceController != null) {
+                instance.preferenceController.onResume();
+            }
         }
     }
 }