From fd759799fe0eac5d9d86dbd2538d73f69b09ae7f Mon Sep 17 00:00:00 2001
From: jsmorley <jsmorley@gmail.com>
Date: Tue, 6 Oct 2009 03:49:03 +0000
Subject: [PATCH] Adding Spx's fix for the #CURRENTCONFG# code.

See http://code.google.com/p/rainmeter/source/detail?r=237 for details.
---
 Library/ConfigParser.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Library/ConfigParser.cpp b/Library/ConfigParser.cpp
index d1f68704..357de662 100644
--- a/Library/ConfigParser.cpp
+++ b/Library/ConfigParser.cpp
@@ -73,6 +73,16 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
 		SetVariable(L"SKINSPATH", pRainmeter->GetSkinPath());
 		SetVariable(L"PLUGINSPATH", pRainmeter->GetPluginPath());
 		SetVariable(L"CURRENTPATH", CRainmeter::ExtractPath(filename));
+
+   		// Set "CURRENTCONFIG" if the path to \Skins is contained in "filename", so it is not set by reading Rainmeter.ini
+		if (_wcsnicmp(filename, pRainmeter->GetSkinPath().c_str(), pRainmeter->GetSkinPath().length()) == 0)
+		{
+			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\\");
 
 		RECT workArea;