diff options
author | Philipp Kerling <pkerling@casix.org> | 2018-06-11 01:33:55 +0200 |
---|---|---|
committer | Philipp Kerling <pkerling@casix.org> | 2018-06-18 17:16:24 +0200 |
commit | 70ba7ab5f0ff60a5b8cf4172b831bfdab1d1a55f (patch) | |
tree | ee78795dfc720ac4999b87ee72ed8b7eb3993333 | |
parent | 42f21e2dc49355430cb4c9673a12fe113190c309 (diff) |
Util::GetMatchingSource: Unset protocol options for matching
If the source URL has protocol options set, files in the source
will never match without removing them first.
-rw-r--r-- | xbmc/Util.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 1d6915c1e3..11951a8b13 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -1223,6 +1223,7 @@ int CUtil::GetMatchingSource(const std::string& strPath1, VECSOURCES& VECSOURCES // and ends with a trailing slash so as not to match a substring CURL urlDest(strPath); urlDest.SetOptions(""); + urlDest.SetProtocolOptions(""); std::string strDest = urlDest.GetWithoutUserDetails(); ForceForwardSlashes(strDest); if (!URIUtils::HasSlashAtEnd(strDest)) @@ -1259,6 +1260,7 @@ int CUtil::GetMatchingSource(const std::string& strPath1, VECSOURCES& VECSOURCES // and ends with a trailing slash so as not to match a substring CURL urlShare(path); urlShare.SetOptions(""); + urlShare.SetProtocolOptions(""); std::string strShare = urlShare.GetWithoutUserDetails(); ForceForwardSlashes(strShare); if (!URIUtils::HasSlashAtEnd(strShare)) |