chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Code optimization.

Browse Source
This commit is contained in:
spx
2010-11-25 22:00:34 +00:00
parent 0e1486f0be
commit 999ab0bd18
17 changed files with 222 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Library/MeterImage.cpp
View File

@ -419,7 +419,11 @@ void CMeterImage::ReadConfig(const WCHAR* section)
std::wstring oldImageName = m_ImageName;
m_ImageName = parser.ReadString(section, L"ImageName", L"");
m_ImageName = m_MeterWindow->MakePathAbsolute(m_Path + m_ImageName);
if (!m_ImageName.empty())
{
m_ImageName.insert(0, m_Path);
m_ImageName = m_MeterWindow->MakePathAbsolute(m_ImageName);
}
if (m_DynamicVariables)
{
@ -539,8 +543,7 @@ void CMeterImage::ReadConfig(const WCHAR* section)
}
else
{
std::wstring error = L"ImageFlip=";
error += flip;
std::wstring error = L"ImageFlip=" + flip;
error += L" is not valid in meter [";
error += m_Name;
error += L"].";
@ -588,7 +591,8 @@ bool CMeterImage::Update()
std::wstring val = m_Measure->GetStringValue(false, 1, 0, false);
if (!val.empty())
{
val = m_MeterWindow->MakePathAbsolute(m_Path + val);
val.insert(0, m_Path);
val = m_MeterWindow->MakePathAbsolute(val);
if (val != m_ImageName)
{
m_ImageName = val;