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

Additional change for 4558c28

Browse Source
This commit is contained in:
spx 2012-05-21 06:41:07 -07:00
parent 8aeee9adab
commit 8dbab54a52
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/ConfigParser.cpp
View File

@ -91,11 +91,6 @@ void CConfigParser::SetBuiltInVariables(const std::wstring& filename, const std:
SetBuiltInVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename)); SetBuiltInVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename));
SetBuiltInVariable(L"ADDONSPATH", Rainmeter->GetAddonPath()); SetBuiltInVariable(L"ADDONSPATH", Rainmeter->GetAddonPath());
if (resourcePath)
{
SetBuiltInVariable(L"@", *resourcePath);
}
if (meterWindow) if (meterWindow)
{ {
SetBuiltInVariable(L"CURRENTFILE", meterWindow->GetSkinIniFile()); SetBuiltInVariable(L"CURRENTFILE", meterWindow->GetSkinIniFile());
@ -108,6 +103,12 @@ void CConfigParser::SetBuiltInVariables(const std::wstring& filename, const std:
const std::wstring CURRENTSECTION = L"CURRENTSECTION"; const std::wstring CURRENTSECTION = L"CURRENTSECTION";
SetBuiltInVariable(CURRENTSECTION, L""); SetBuiltInVariable(CURRENTSECTION, L"");
m_CurrentSection = &((*m_BuiltInVariables.find(CURRENTSECTION)).second); // shortcut m_CurrentSection = &((*m_BuiltInVariables.find(CURRENTSECTION)).second); // shortcut
// Following built-in variables are overridable by normal variable.
if (resourcePath)
{
SetVariable(L"@", *resourcePath);
}
} }
/* /*