[Android] Fix logic fail

Geoffrey Métais git at videolan.org
Mon Jul 31 09:23:14 CEST 2017


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jul 31 09:22:48 2017 +0200| [824dc6b814efc2185f979b438d4e68aff32e990a] | committer: Geoffrey Métais

Fix logic fail

Close #331

> https://code.videolan.org/videolan/vlc-android/commit/824dc6b814efc2185f979b438d4e68aff32e990a
---

 vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java
index 7fce72aed..d245495e2 100644
--- a/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserFragment.java
@@ -140,8 +140,6 @@ public abstract class BaseBrowserFragment extends SortableFragment<BaseBrowserAd
         if (bundle != null) {
             if (VLCApplication.hasData(KEY_CONTENT_LIST))
                 mFoldersContentLists = (SimpleArrayMap<MediaLibraryItem, ArrayList<MediaLibraryItem>>) VLCApplication.getData(KEY_CONTENT_LIST);
-            if (mFoldersContentLists == null)
-                mFoldersContentLists = new SimpleArrayMap<>();
             mCurrentMedia = bundle.getParcelable(KEY_MEDIA);
             if (mCurrentMedia != null)
                 mMrl = mCurrentMedia.getLocation();
@@ -152,6 +150,8 @@ public abstract class BaseBrowserFragment extends SortableFragment<BaseBrowserAd
             mMrl = getActivity().getIntent().getDataString();
             getActivity().setIntent(null);
         }
+        if (mFoldersContentLists == null)
+            mFoldersContentLists = new SimpleArrayMap<>();
     }
 
     @Override



More information about the Android mailing list