upnp: not all internal upnp paths were /'d at the end

diff --git a/xbmc/filesystem/UPnPDirectory.cpp b/xbmc/filesystem/UPnPDirectory.cpp
index 49c8449..6706214 100644 (file)
--- a/xbmc/filesystem/UPnPDirectory.cpp
+++ b/xbmc/filesystem/UPnPDirectory.cpp
@@ -29,6 +29,7 @@
 #include "video/VideoInfoTag.h"
 #include "FileItem.h"
 #include "utils/log.h"
+#include "utils/URIUtils.h"
 
 using namespace MUSIC_INFO;
 using namespace XFILE;
@@ -325,11 +326,8 @@ CUPnPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
 
             CStdString id = (char*) (*entry)->m_ObjectID;
             CURL::Encode(id);
-            if(pItem->m_bIsFolder) {
-                pItem->SetPath(CStdString((const char*) "upnp://" + uuid + "/" + id.c_str()));
-            } else {
-                pItem->SetPath(CStdString((const char*) "upnp://" + uuid + "/" + id.c_str() + "/"));
-            }
+            URIUtils::AddSlashAtEnd(id);
+            pItem->SetPath(CStdString((const char*) "upnp://" + uuid + "/" + id.c_str()));
 
             items.Add(pItem);
 

diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp
index 2e156f0..f2734d2 100644 (file)
--- a/xbmc/network/upnp/UPnP.cpp
+++ b/xbmc/network/upnp/UPnP.cpp
@@ -180,6 +180,7 @@ public:
         if (!NPT_StringsEqual(item_id, "0")) {
             CStdString id = item_id;
             CURL::Encode(id);
+            URIUtils::AddSlashAtEnd(id);
             path += id.c_str();
         }