diff --git a/Common/Gfx/Util/DWriteFontFileEnumerator.cpp b/Common/Gfx/Util/DWriteFontFileEnumerator.cpp index 54e72186..dba428af 100644 --- a/Common/Gfx/Util/DWriteFontFileEnumerator.cpp +++ b/Common/Gfx/Util/DWriteFontFileEnumerator.cpp @@ -61,7 +61,7 @@ HRESULT STDMETHODCALLTYPE DWriteFontFileEnumerator::QueryInterface(IID const& ri HRESULT STDMETHODCALLTYPE DWriteFontFileEnumerator::MoveNext(BOOL* hasCurrentFile) { - *hasCurrentFile = (++m_CurrentFontFileIndex < m_FontFiles.size()); + *hasCurrentFile = (++m_CurrentFontFileIndex < (int)m_FontFiles.size()); return S_OK; } diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index e6edf72e..94dd5a31 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -2078,13 +2078,11 @@ bool MeterWindow::ReadSkin() } m_Canvas = Gfx::Canvas::Create(useD2D ? Gfx::Renderer::PreferD2D : Gfx::Renderer::GDIP); + m_Canvas->SetAccurateText(m_Parser.ReadBool(L"Rainmeter", L"AccurateText", false)); // Gotta have some kind of buffer during initialization CreateDoubleBuffer(1, 1); - m_AccurateText = m_Parser.ReadBool(L"Rainmeter", L"AccurateText", false); - m_Canvas->SetAccurateText(m_AccurateText); - // Check the version UINT appVersion = m_Parser.ReadUInt(L"Rainmeter", L"AppVersion", 0); if (appVersion > RAINMETER_VERSION) diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index cb31e328..c4f8d8b6 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -324,7 +324,6 @@ private: void CreateDoubleBuffer(int cx, int cy); Gfx::Canvas* m_Canvas; - bool m_AccurateText; ConfigParser m_Parser;