From d09c18a86289885564ab4231672016f256e48e34 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Thu, 25 Apr 2013 16:40:20 +0300
Subject: [PATCH] Fix "Image: Unable to open..." errors on refresh in some
 cases 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.

---
 Library/MeterWindow.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp
index bc87d9ed..2bb3fada 100644
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -2152,7 +2152,8 @@ bool CMeterWindow::ReadSkin()
 		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_HasButtons = false;
 	CMeter* prevMeter = NULL;
@@ -2212,8 +2213,16 @@ bool CMeterWindow::ReadSkin()
 		return false;
 	}
 
-	// Initialize meters. Separate loop to avoid errors caused with section
-	// variables for nonexistent measures/meters.
+	// Read measure options. This is done before the meters to ensure that e.g. Substitute is used
+	// 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)
 	{
 		CMeter* meter = *iter;
@@ -2226,12 +2235,10 @@ bool CMeterWindow::ReadSkin()
 		}
 	}
 
-	// Initialize measures. Separate loop to avoid errors caused by
-	// referencing nonexistent [measures] in the measure options.
+	// Initialize measures.
 	for (auto iter = m_Measures.cbegin(); iter != m_Measures.cend(); ++iter)
 	{
 		CMeasure* measure = *iter;
-		measure->ReadOptions(m_Parser);
 		measure->Initialize();
 	}