Skip to content

Commit

Permalink
Fix: Always add m_discStubExtensions to m_videoExtensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Waven committed Sep 20, 2013
1 parent cc88931 commit f26b025
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions xbmc/settings/AdvancedSettings.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -434,6 +434,11 @@ bool CAdvancedSettings::Load()
for (unsigned int i = 0; i < m_settingsFiles.size(); i++) for (unsigned int i = 0; i < m_settingsFiles.size(); i++)
ParseSettingsFile(m_settingsFiles[i]); ParseSettingsFile(m_settingsFiles[i]);
ParseSettingsFile(CProfilesManager::Get().GetUserDataItem("advancedsettings.xml")); 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; return true;
} }


Expand Down Expand Up @@ -954,10 +959,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
if (pExts) if (pExts)
GetCustomExtensions(pExts, m_discStubExtensions); 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(); m_vecTokens.clear();
CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens); CLangInfo::LoadTokens(pRootElement->FirstChild("sorttokens"),m_vecTokens);


Expand Down

0 comments on commit f26b025

Please sign in to comment.