diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-09-17 08:15:44 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-09-17 08:15:44 +0200 |
| commit | 9a67be38f37cff3ad1a2263a141e5f4ae220275c (patch) | |
| tree | 1adc3721c5022bf9fc2e9b943961d7f8606fe7f0 | |
| parent | 8ee526e411cee3e17be93b780d29a5d67bd2df1f (diff) | |
| parent | 24a0c10955677742e70d2e97dbe171dd53409216 (diff) | |
Merge pull request #8067 from koying/fixdroidstorageI
FIX: [droid;storage] check readability last
| -rw-r--r-- | xbmc/storage/android/AndroidStorageProvider.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xbmc/storage/android/AndroidStorageProvider.cpp b/xbmc/storage/android/AndroidStorageProvider.cpp index 37a2693853..dc0c4189ab 100644 --- a/xbmc/storage/android/AndroidStorageProvider.cpp +++ b/xbmc/storage/android/AndroidStorageProvider.cpp @@ -183,10 +183,6 @@ void CAndroidStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives) // Blacklist bool bl_ok = true; - // Reject unreadable - if (!XFILE::CDirectory::Exists(mountStr)) - bl_ok = false; - // What mount points are rejected for (unsigned int i=0; i < ARRAY_SIZE(mountBL); ++i) if (StringUtils::StartsWithNoCase(mountStr, mountBL[i])) @@ -214,11 +210,15 @@ void CAndroidStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives) if(devok && (fsok || mountok)) { - CMediaSource share; - share.strPath = unescape(mountStr); - share.strName = URIUtils::GetFileName(mountStr); - share.m_ignore = true; - removableDrives.push_back(share); + // Reject unreadable + if (XFILE::CDirectory::Exists(mountStr)) + { + CMediaSource share; + share.strPath = unescape(mountStr); + share.strName = URIUtils::GetFileName(mountStr); + share.m_ignore = true; + removableDrives.push_back(share); + } } } } |