From f175be3f9199e58ef4bab1cf4ae90d5f901060fd Mon Sep 17 00:00:00 2001 From: Brian Ferguson Date: Sat, 1 Aug 2015 08:32:34 -0400 Subject: [PATCH] ImageMeter: Fixed removal of 'MaskImageName' via !SetOption. http://rainmeter.net/forum/viewtopic.php?p=113640#p113640 --- Library/MeterImage.cpp | 3 +-- Library/MeterImage.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Library/MeterImage.cpp b/Library/MeterImage.cpp index ac607376b..298de5fe1 100644 --- a/Library/MeterImage.cpp +++ b/Library/MeterImage.cpp @@ -68,9 +68,8 @@ void MeterImage::LoadImage(const std::wstring& imageName, bool bLoadAlways) if (m_Image.IsLoaded()) { bool useMaskSize = false; - if (m_Skin->GetUseD2D() && !m_MaskImageName.empty()) + if (m_Skin->GetUseD2D()) { - m_MaskImageNameResult = m_MaskImageName; m_MaskImage.LoadImage(m_MaskImageName, true); if (m_MaskImage.IsLoaded()) useMaskSize = true; diff --git a/Library/MeterImage.h b/Library/MeterImage.h index 501d426be..ae71a9dcb 100644 --- a/Library/MeterImage.h +++ b/Library/MeterImage.h @@ -60,7 +60,6 @@ class MeterImage : public Meter TintedImage m_MaskImage; std::wstring m_MaskImageName; - std::wstring m_MaskImageNameResult; bool m_NeedsRedraw; DRAWMODE m_DrawMode;