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

PerfMon.dll: Fixed issues with MaxValue

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-04-07 14:25:38 +03:00
parent 10da9bea0e
commit 56679f0922
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Library/MeasurePlugin.cpp
View File

@ -183,6 +183,8 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
// Remove current directory from DLL search path // Remove current directory from DLL search path
SetDllDirectory(L""); SetDllDirectory(L"");
double maxValue;
if (IsNewApi()) if (IsNewApi())
{ {
m_PluginData = (void*)id; m_PluginData = (void*)id;
@ -192,7 +194,7 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
((NEWINITIALIZE)initializeFunc)(&m_PluginData, this); ((NEWINITIALIZE)initializeFunc)(&m_PluginData, this);
} }
((NEWRELOAD)m_ReloadFunc)(m_PluginData, this, &m_MaxValue); ((NEWRELOAD)m_ReloadFunc)(m_PluginData, this, &maxValue);
} }
else else
{ {
@ -204,24 +206,24 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
m_Update2 = true; m_Update2 = true;
} }
double oldMaxValue = m_MaxValue;
if (initializeFunc) if (initializeFunc)
{ {
m_MaxValue = ((INITIALIZE)initializeFunc)(m_Plugin, parser.GetFilename().c_str(), section, m_ID); maxValue = ((INITIALIZE)initializeFunc)(m_Plugin, parser.GetFilename().c_str(), section, m_ID);
}
const std::wstring& szMaxValue = parser.ReadString(section, L"MaxValue", L"");
if (!szMaxValue.empty())
{
m_MaxValue = oldMaxValue;
} }
} }
if (m_MaxValue == 0.0) const std::wstring& szMaxValue = parser.ReadString(section, L"MaxValue", L"");
if (szMaxValue.empty())
{ {
m_MaxValue = 1.0; if (maxValue == 0.0)
m_LogMaxValue = true; {
m_MaxValue = 1.0;
m_LogMaxValue = true;
}
else
{
m_MaxValue = maxValue;
}
} }
// Reset to default // Reset to default

3
Plugins/PluginPerfMon/PerfData.cpp
View File

@ -90,9 +90,8 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{ {
measure->oldValue = 0; measure->oldValue = 0;
measure->firstTime = true; measure->firstTime = true;
*maxValue = 0.0;
} }
*maxValue = 0.0;
} }
PLUGIN_EXPORT double Update(void* data) PLUGIN_EXPORT double Update(void* data)