diff --git a/Library/MeterString.cpp b/Library/MeterString.cpp index 333b5a8f..eb7e3ab6 100644 --- a/Library/MeterString.cpp +++ b/Library/MeterString.cpp @@ -328,9 +328,9 @@ void CMeterString::ReadOptions(CConfigParser& parser, const WCHAR* section) m_Color = parser.ReadColor(section, L"FontColor", Color::Black); m_EffectColor = parser.ReadColor(section, L"FontEffectColor", Color::Black); - m_Prefix = parser.ReadString(section, L"Prefix", L""); - m_Postfix = parser.ReadString(section, L"Postfix", L""); - m_Text = parser.ReadString(section, L"Text", L""); + m_Text = parser.ReadString(section, L"Prefix", L""); + m_Text += parser.ReadString(section, L"Text", L""); + m_Text += parser.ReadString(section, L"Postfix", L""); m_Percentual = 0!=parser.ReadInt(section, L"Percentual", 0); m_ClipString = 0!=parser.ReadInt(section, L"ClipString", 0); @@ -507,26 +507,11 @@ bool CMeterString::Update() stringValues.push_back((*iter)->GetStringValue(m_AutoScale, m_Scale, decimals, m_Percentual)); } - // Create the text - m_String = m_Prefix; - if (m_Text.empty()) + m_String = m_Text; + if (!stringValues.empty()) { - if (!stringValues.empty()) - { - m_String += stringValues[0]; - } + ReplaceMeasures(stringValues, m_String); } - else if (!stringValues.empty()) - { - std::wstring tmpText = m_Text; - ReplaceMeasures(stringValues, tmpText); - m_String += tmpText; - } - else - { - m_String += m_Text; - } - if (!m_Postfix.empty()) m_String += m_Postfix; switch (m_Case) { diff --git a/Library/MeterString.h b/Library/MeterString.h index 26dafb15..825aa270 100644 --- a/Library/MeterString.h +++ b/Library/MeterString.h @@ -75,8 +75,6 @@ private: Gdiplus::Color m_Color; Gdiplus::Color m_EffectColor; - std::wstring m_Postfix; - std::wstring m_Prefix; std::wstring m_Text; std::wstring m_FontFace; AUTOSCALE m_AutoScale;