Merge pull request #17407 from AlwinEsch/Leia-fix-vfs-addon-view

[backport][vfs][addons] fix media view from addon given content

1 files changed, 11 insertions, 3 deletions

diff --git a/xbmc/filesystem/FileDirectoryFactory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp
index a3144f60d9..b7fa0ffae7 100644
--- a/xbmc/filesystem/FileDirectoryFactory.cpp
+++ b/xbmc/filesystem/FileDirectoryFactory.cpp
@@ -86,13 +86,21 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem,
               *pItem = *wrap->m_items[0];
             }
             else
-            { // compressed or more than one file -> create a dir
-              pItem->SetPath(wrap->m_items.GetPath());
-              return wrap;
+            {
+              // compressed or more than one file -> create a dir
+              *pItem = wrap->m_items;
             }
+
+            // Check for folder, if yes return also wrap.
+            // Needed to fix for e.g. RAR files with only one file inside
+            pItem->m_bIsFolder = URIUtils::HasSlashAtEnd(pItem->GetPath());
+            if (pItem->m_bIsFolder)
+              return wrap;
           }
           else
+          {
             pItem->m_bIsFolder = true;
+          }
 
           delete wrap;
           return nullptr;