[Android] PreferencesActivity: fix NPE

Thomas Guillem git at videolan.org
Fri Oct 9 09:29:02 CEST 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Oct  9 09:28:44 2015 +0200| [f4b46f16f3ac68abd7375f436e59af7b77f0ee48] | committer: Thomas Guillem

PreferencesActivity: fix NPE

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=f4b46f16f3ac68abd7375f436e59af7b77f0ee48
---

 vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
index 01a2648..27051c4 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
@@ -374,10 +374,9 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         super.onPreferenceTreeClick(preferenceScreen, preference);
-        if (preference instanceof PreferenceScreen)
-            setUpNestedScreen((PreferenceScreen) preference);
         try {
             if (preference!=null && preference instanceof PreferenceScreen) {
+                setUpNestedScreen((PreferenceScreen) preference);
                 Dialog dialog = ((PreferenceScreen)preference).getDialog();
                 if (dialog!=null) {
                     Window window = dialog.getWindow();



More information about the Android mailing list