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

Minor optimizations & fixes.

Browse Source
This commit is contained in:
spx
2011-05-22 16:02:43 +00:00
parent 7dd3bb1ed4
commit 3356448dbe
5 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Library/MeasurePlugin.cpp
View File

@ -68,15 +68,14 @@ bool CMeasurePlugin::Update()
{
if (!CMeasure::PreUpdate()) return false;
WCHAR buffer[MAX_PATH];
GetCurrentDirectory(MAX_PATH, buffer);
bool bulkUpdating = (m_MeterWindow && m_MeterWindow->IsBulkUpdating());
std::wstring dir = Rainmeter->GetSkinPath();
if (m_MeterWindow)
if (!bulkUpdating)
{
dir += m_MeterWindow->GetSkinName();
std::wstring dir = Rainmeter->GetSkinPath();
if (m_MeterWindow) dir += m_MeterWindow->GetSkinName();
CSystem::SetWorkingDirectory(dir);
}
SetCurrentDirectory(dir.c_str());
if (UpdateFunc)
{
@ -89,7 +88,10 @@ bool CMeasurePlugin::Update()
m_Value = UpdateFunc2(m_ID);
}
SetCurrentDirectory(buffer);
if (!bulkUpdating)
{
CSystem::ResetWorkingDirectory();
}
return PostUpdate();
}
@ -181,23 +183,17 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_ID = id++;
if (InitializeFunc)
{
WCHAR buffer[MAX_PATH];
GetCurrentDirectory(MAX_PATH, buffer);
std::wstring dir = Rainmeter->GetSkinPath();
if (m_MeterWindow)
{
dir += m_MeterWindow->GetSkinName();
}
SetCurrentDirectory(dir.c_str());
// Remove current directory from DLL search path
SetDllDirectory(L"");
std::wstring dir = Rainmeter->GetSkinPath();
if (m_MeterWindow) dir += m_MeterWindow->GetSkinName();
CSystem::SetWorkingDirectory(dir);
double maxValue;
maxValue = InitializeFunc(m_Plugin, parser.GetFilename().c_str(), section, m_ID);
SetCurrentDirectory(buffer);
CSystem::ResetWorkingDirectory();
std::wstring szMaxValue = parser.ReadString(section, L"MaxValue", L"NotSet");
if (szMaxValue == L"NotSet")