From 67a57ca9ee567cc4a0d5a1f76901bbf9bc606fb8 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Wed, 18 Jul 2012 17:35:07 +0300 Subject: [PATCH] Additional change to 4dbf793 --- Library/MeterWindow.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 3917b69a..27edb8da 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -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());