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

Fix "Image: Unable to open..." errors on refresh in some cases

Browse Source 
The error usually occurred because the substitutes were not applied on the measure value on the first time. This change ensures that measure options are read prior to reading meter options.
This commit is contained in:
Birunthan Mohanathas 2013-04-25 16:40:20 +03:00
parent c834e59bcd
commit d09c18a862
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/MeterWindow.cpp
View File

@ -2152,7 +2152,8 @@ bool CMeterWindow::ReadSkin()
while (*localFont); while (*localFont);
} }
// Create all meters and measures. // Create all meters and measures. The meters and measures are not initialized in this loop
// to avoid errors caused by referencing nonexistent [sections] in the options.
m_HasNetMeasures = false; m_HasNetMeasures = false;
m_HasButtons = false; m_HasButtons = false;
CMeter* prevMeter = NULL; CMeter* prevMeter = NULL;
@ -2212,8 +2213,16 @@ bool CMeterWindow::ReadSkin()
return false; return false;
} }
// Initialize meters. Separate loop to avoid errors caused with section // Read measure options. This is done before the meters to ensure that e.g. Substitute is used
// variables for nonexistent measures/meters. // when the meters get the value of the measure. The measures cannot be initialized yet as som
// measures (e.g. Script) except that the meters are ready when calling Initialize().
for (auto iter = m_Measures.cbegin(); iter != m_Measures.cend(); ++iter)
{
CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
}
// Initialize meters.
for (auto iter = m_Meters.cbegin(); iter != m_Meters.cend(); ++iter) for (auto iter = m_Meters.cbegin(); iter != m_Meters.cend(); ++iter)
{ {
CMeter* meter = *iter; CMeter* meter = *iter;
@ -2226,12 +2235,10 @@ bool CMeterWindow::ReadSkin()
} }
} }
// Initialize measures. Separate loop to avoid errors caused by // Initialize measures.
// referencing nonexistent [measures] in the measure options.
for (auto iter = m_Measures.cbegin(); iter != m_Measures.cend(); ++iter) for (auto iter = m_Measures.cbegin(); iter != m_Measures.cend(); ++iter)
{ {
CMeasure* measure = *iter; CMeasure* measure = *iter;
measure->ReadOptions(m_Parser);
measure->Initialize(); measure->Initialize();
} }