Additional change to 4dbf793

This commit is contained in:
Birunthan Mohanathas 2012-07-18 17:35:07 +03:00
parent ffd3cff0e1
commit 67a57ca9ee

View File

@ -2174,15 +2174,6 @@ bool CMeterWindow::ReadSkin()
}
}
// Initialize measures. This is a separate loop to avoid errors caused by
// referencing not-yet-existent [measures] in the options.
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{
CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
measure->Initialize();
}
// Initialize meters.
m_Meters.reserve(meters.size());
CMeter* prevMeter = NULL;
@ -2208,6 +2199,15 @@ bool CMeterWindow::ReadSkin()
prevMeter = meter;
}
// Initialize measures. This is a separate loop to avoid errors caused by
// referencing not-yet-existent [measures] in the options.
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{
CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
measure->Initialize();
}
if (m_Meters.empty())
{
std::wstring text = GetFormattedString(ID_STR_NOMETERSINSKIN, m_FolderPath.c_str(), m_FileName.c_str());