ImageMeter: Fixed removal of 'MaskImageName' via !SetOption.

http://rainmeter.net/forum/viewtopic.php?p=113640#p113640
rainmeter · Aug 1, 2015 · f175be3 · f175be3
1 parent 7473acf
commit f175be3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;