Fixed group bang issue since 4778184

http://rainmeter.net/forum/viewtopic.php?p=73793
This commit is contained in:
Birunthan Mohanathas 2012-08-06 18:50:42 +03:00
parent 6a76afe792
commit 05f411c579

View File

@ -2191,17 +2191,8 @@ bool CMeterWindow::ReadSkin()
prevMeter = meter; prevMeter = meter;
} }
// Initialize measures. Separate loop to avoid errors caused by // Initialize meters. Separate loop to avoid errors caused with section
// referencing nonexistent [measures] in the measure options. // variables for nonexistent measures/meters.
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{
CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
measure->Initialize();
}
// Initialize meters. Separate loop to avoid errors caused by referencing
// nonexistent [Measures:] in the meter options. (Dynamic Section Variables)
for (auto iter = meters.cbegin(); iter != meters.cend(); ++iter) for (auto iter = meters.cbegin(); iter != meters.cend(); ++iter)
{ {
CMeter* meter = *iter; CMeter* meter = *iter;
@ -2214,6 +2205,15 @@ bool CMeterWindow::ReadSkin()
} }
} }
// Initialize measures. Separate loop to avoid errors caused by
// referencing nonexistent [measures] in the measure options.
for (auto iter = measures.cbegin(); iter != measures.cend(); ++iter)
{
CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
measure->Initialize();
}
if (m_Meters.empty()) if (m_Meters.empty())
{ {
std::wstring text = GetFormattedString(ID_STR_NOMETERSINSKIN, m_FolderPath.c_str(), m_FileName.c_str()); std::wstring text = GetFormattedString(ID_STR_NOMETERSINSKIN, m_FolderPath.c_str(), m_FileName.c_str());