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

Reverted r718.

Browse Source
This commit is contained in:
spx 2011-02-02 23:17:44 +00:00
parent 7bd61751c9
commit 249e021001
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Rainmeter.cpp
View File

@ -2224,7 +2224,7 @@ void CRainmeter::ActivateConfig(int configIndex, int iniIndex)
else else
{ {
// Deactivate the existing config // Deactivate the existing config
DeactivateConfig((*iter).second, configIndex, false); DeactivateConfig((*iter).second, configIndex);
} }
} }
@ -2258,7 +2258,7 @@ void CRainmeter::ActivateConfig(int configIndex, int iniIndex)
} }
} }
bool CRainmeter::DeactivateConfig(CMeterWindow* meterWindow, int configIndex, bool bLater) bool CRainmeter::DeactivateConfig(CMeterWindow* meterWindow, int configIndex)
{ {
if (configIndex >= 0 && configIndex < (int)m_ConfigStrings.size()) if (configIndex >= 0 && configIndex < (int)m_ConfigStrings.size())
{ {
@ -2283,7 +2283,7 @@ bool CRainmeter::DeactivateConfig(CMeterWindow* meterWindow, int configIndex, bo
// Disable the config in the ini-file // Disable the config in the ini-file
WriteActive(meterWindow->GetSkinName(), -1); WriteActive(meterWindow->GetSkinName(), -1);
return DeleteMeterWindow(meterWindow, bLater); return DeleteMeterWindow(meterWindow, true);
} }
return false; return false;
} }

2
Library/Rainmeter.h
View File

@ -180,7 +180,7 @@ public:
const std::vector<std::wstring>& GetAllThemes() { return m_Themes; } const std::vector<std::wstring>& GetAllThemes() { return m_Themes; }
void ActivateConfig(int configIndex, int iniIndex); void ActivateConfig(int configIndex, int iniIndex);
bool DeactivateConfig(CMeterWindow* meterWindow, int configIndex, bool bLater = true); bool DeactivateConfig(CMeterWindow* meterWindow, int configIndex);
const std::wstring& GetPath() { return m_Path; } const std::wstring& GetPath() { return m_Path; }
const std::wstring& GetIniFile() { return m_IniFile; } const std::wstring& GetIniFile() { return m_IniFile; }