Backing out the change in r237. The #CURRENTCONFIG# routine can cause an error when Rainmeter first Initializes before the first skin is read.

See the comments in r237 for details.
This commit is contained in:
jsmorley 2009-10-06 02:16:35 +00:00
parent 4bed8bdbbd
commit 3da892f271

View File

@ -73,12 +73,6 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
SetVariable(L"SKINSPATH", pRainmeter->GetSkinPath()); SetVariable(L"SKINSPATH", pRainmeter->GetSkinPath());
SetVariable(L"PLUGINSPATH", pRainmeter->GetPluginPath()); SetVariable(L"PLUGINSPATH", pRainmeter->GetPluginPath());
SetVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename)); SetVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename));
std::wstring cPath = CRainmeter::ExtractPath(filename);
cPath = cPath.substr(pRainmeter->GetSkinPath().length(),
cPath.length()-pRainmeter->GetSkinPath().length()-1);
SetVariable(L"CURRENTCONFIG", cPath);
SetVariable(L"ADDONSPATH", pRainmeter->GetPath() + L"Addons\\"); SetVariable(L"ADDONSPATH", pRainmeter->GetPath() + L"Addons\\");
RECT workArea; RECT workArea;