Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix: Always add m_discStubExtensions to m_videoExtensions

  • Loading branch information...
commit f26b0259e58575d4c35498616318d108f9ecbfac 1 parent cc88931
@waven waven authored
Showing with 5 additions and 4 deletions.
  1. +5 −4 xbmc/settings/AdvancedSettings.cpp
View
9 xbmc/settings/AdvancedSettings.cpp
@@ -434,6 +434,11 @@ bool CAdvancedSettings::Load()
for (unsigned int i = 0; i < m_settingsFiles.size(); i++)
ParseSettingsFile(m_settingsFiles[i]);
ParseSettingsFile(CProfilesManager::Get().GetUserDataItem("advancedsettings.xml"));
+
+ // Add the list of disc stub extensions (if any) to the list of video extensions
+ if (!m_discStubExtensions.IsEmpty())
+ m_videoExtensions += "|" + m_discStubExtensions;
+
return true;
}
@@ -954,10 +959,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
if (pExts)
GetCustomExtensions(pExts, m_discStubExtensions);
- // Add the list of disc stub extensions (if any) to the list of video extensions
- if (!m_discStubExtensions.IsEmpty())
- m_videoExtensions += "|" + m_discStubExtensions;
-
m_vecTokens.clear();
CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens);

0 comments on commit f26b025

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