aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/Util.cpp8
-rw-r--r--xbmc/settings/AdvancedSettings.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 72ebae8dc7..bd333deadc 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -1972,6 +1972,14 @@ int CUtil::ScanArchiveForAssociatedItems(const std::string& strArchivePath,
std::string strPathInRar = item->GetPath();
std::string strExt = URIUtils::GetExtension(strPathInRar);
+ // Check another archive in archive
+ if (strExt == ".zip" || strExt == ".rar")
+ {
+ nItemsAdded +=
+ ScanArchiveForAssociatedItems(strPathInRar, videoNameNoExt, item_exts, associatedFiles);
+ continue;
+ }
+
// check that the found filename matches the movie filename
size_t fnl = videoNameNoExt.size();
// NOTE: We don't know if videoNameNoExt is URL-encoded, so try both
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 61dcc3ac7d..59efd8e959 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -197,7 +197,7 @@ void CAdvancedSettings::Initialize()
m_songInfoDuration = 10;
- m_cddbAddress = "freedb.freedb.org";
+ m_cddbAddress = "gnudb.gnudb.org";
m_addSourceOnTop = false;
m_handleMounting = g_application.IsStandAlone();