From 74c3c2cf5c534fe2ecc231379c6eb2a859411d63 Mon Sep 17 00:00:00 2001 From: jsmorley Date: Mon, 21 May 2012 10:21:09 -0400 Subject: [PATCH] Fixed errors on Refresh All from context menu or Manage. --- Library/MeterWindow.h | 4 ++-- Library/Rainmeter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index a0755bca..80915df5 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -449,8 +449,8 @@ private: std::list m_Measures; std::list m_Meters; - const std::wstring& m_SkinName; - const std::wstring& m_SkinIniFile; + const std::wstring m_SkinName; + const std::wstring m_SkinIniFile; int m_UpdateCounter; UINT m_MouseMoveCounter; diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index 741b48e9..ce3956d1 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -1253,7 +1253,7 @@ void CRainmeter::ActivateConfig(int configIndex, int iniIndex) std::map::const_iterator iter = m_MeterWindows.find(skinConfig); if (iter != m_MeterWindows.end()) { - if (&((*iter).second)->GetSkinIniFile() == &skinIniFile) + if (((*iter).second)->GetSkinIniFile() == skinIniFile) { LogWithArgs(LOG_WARNING, L"!ActivateConfig: \"%s\" already active", skinConfig.c_str()); return;