diff --git a/Library/Meter.cpp b/Library/Meter.cpp index dbfbdf5b..6e50a13e 100644 --- a/Library/Meter.cpp +++ b/Library/Meter.cpp @@ -308,24 +308,28 @@ void Meter::ReadOptions(ConfigParser& parser, const WCHAR* section) static const Gdiplus::Rect defPadding; m_Padding = parser.ReadRect(section, L"Padding", defPadding); - int oldW = m_W; - bool oldWDefined = m_WDefined; - int w = parser.ReadInt(section, L"W", m_W); - m_WDefined = parser.GetLastValueDefined(); - if (IsFixedSize(true)) m_W = w; + const int oldW = m_W; + const bool oldWDefined = m_WDefined; const int widthPadding = GetWidthPadding(); + + const int w = parser.ReadInt(section, L"W", m_W); + m_WDefined = parser.GetLastValueDefined(); + + if (IsFixedSize(true)) m_W = w; if (oldW != (m_W - widthPadding)) m_W += widthPadding; if (!m_WDefined && oldWDefined && IsFixedSize()) { m_W = 0; } - int oldH = m_H; - bool oldHDefined = m_HDefined; - int h = parser.ReadInt(section, L"H", m_H); - m_HDefined = parser.GetLastValueDefined(); - if (IsFixedSize(true)) m_H = h; + const int oldH = m_H; + const bool oldHDefined = m_HDefined; const int heightPadding = GetHeightPadding(); + + const int h = parser.ReadInt(section, L"H", m_H); + m_HDefined = parser.GetLastValueDefined(); + + if (IsFixedSize(true)) m_H = h; if (oldH != (m_H - heightPadding)) m_H += heightPadding; if (!m_HDefined && oldHDefined && IsFixedSize()) {