chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Additional change to 4dbf793

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-07-18 17:35:07 +03:00
parent ffd3cff0e1
commit 67a57ca9ee
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/MeterWindow.cpp
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. // Initialize meters.
m_Meters.reserve(meters.size()); m_Meters.reserve(meters.size());
CMeter* prevMeter = NULL; CMeter* prevMeter = NULL;
@ -2208,6 +2199,15 @@ bool CMeterWindow::ReadSkin()
prevMeter = meter; 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()) 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());