Skip to content
Browse files

don't blindly add slashes at the end of sources. fixes #13550

  • Loading branch information...
1 parent 25bb46a commit 94dfb77509bf6fc1656a539dbffed92a2f51aed4 Jonathan Marshall committed Nov 15, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −1 xbmc/FileItem.cpp
  2. +0 −1 xbmc/MediaSource.cpp
  3. +0 −1 xbmc/dialogs/GUIDialogMediaSource.cpp
View
3 xbmc/FileItem.cpp
@@ -357,7 +357,8 @@ CFileItem::CFileItem(const CMediaSource& share)
m_bIsFolder = true;
m_bIsShareOrDrive = true;
m_strPath = share.strPath;
- URIUtils::AddSlashAtEnd(m_strPath);
+ if (!IsRSS()) // no slash at end for rss feeds
+ URIUtils::AddSlashAtEnd(m_strPath);
CStdString label = share.strName;
if (!share.strStatus.IsEmpty())
label.Format("%s (%s)", share.strName.c_str(), share.strStatus.c_str());
View
1 xbmc/MediaSource.cpp
@@ -74,7 +74,6 @@ void CMediaSource::FromNameAndPaths(const CStdString &category, const CStdString
m_iDriveType = SOURCE_TYPE_UNKNOWN;
// check - convert to url and back again to make sure strPath is accurate
// in terms of what we expect
- URIUtils::AddSlashAtEnd(strPath);
strPath = CURL(strPath).Get();
}
View
1 xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -366,7 +366,6 @@ void CGUIDialogMediaSource::OnPath(int item)
CStdString path(m_paths->Get(item)->GetPath());
CGUIKeyboardFactory::ShowAndGetInput(path, g_localizeStrings.Get(1021), false);
- URIUtils::AddSlashAtEnd(path);
m_paths->Get(item)->SetPath(path);
if (!m_bNameChanged || m_name.IsEmpty())

0 comments on commit 94dfb77

Please sign in to comment.
Something went wrong with that request. Please try again.