Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix PreferenceActivity NPE
This commit is contained in:
Martin Fietz 2015-09-23 23:21:43 +02:00
parent a89edfcad4 b6a0c1aa1a
commit 5e458ec305
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
View File

@ -102,13 +102,17 @@ public class PreferenceActivity extends ActionBarActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
if(instance.preferenceController != null) {
instance.preferenceController.onCreate(); instance.preferenceController.onCreate();
} }
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if(instance.preferenceController != null) {
instance.preferenceController.onResume(); instance.preferenceController.onResume();
} }
} }
} }
}