Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

temp merge of: fixed: m_videoDefaultLatency wasn't initialized when t…

…here was no advancedsettings.xml file to load
  • Loading branch information...
commit 1dafc8787caca137ea513e89992a0f7e78e31697 1 parent 1981390
bobo1on1 authored committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  xbmc/settings/AdvancedSettings.cpp
View
2  xbmc/settings/AdvancedSettings.cpp
@@ -100,6 +100,7 @@ void CAdvancedSettings::Initialize()
m_DXVACheckCompatibilityPresent = false;
m_DXVAForceProcessorRenderer = true;
m_videoFpsDetect = 1;
+ m_videoDefaultLatency = 0.0;
m_musicUseTimeSeeking = true;
m_musicTimeSeekForward = 10;
@@ -555,7 +556,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetInt(pElement, "fpsdetect", m_videoFpsDetect, 0, 2);
// Store global display latency settings
- m_videoDefaultLatency = 0;
TiXmlElement* pVideoLatency = pElement->FirstChildElement("latency");
if (pVideoLatency)
{
Please sign in to comment.
Something went wrong with that request. Please try again.