mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Groups can now be defined under the skins [Rainmeter] section as well (in addition to Rainmeter.ini).
Also fixed small typo in r622.
This commit is contained in:
@ -1541,8 +1541,6 @@ void CMeterWindow::ReadConfig()
|
||||
m_AlphaValue = 255;
|
||||
m_FadeDuration = 250;
|
||||
|
||||
std::wstring group = L"";
|
||||
|
||||
CConfigParser parser;
|
||||
parser.Initialize(iniFile.c_str(), m_Rainmeter);
|
||||
|
||||
@ -1622,8 +1620,7 @@ void CMeterWindow::ReadConfig()
|
||||
|
||||
m_FadeDuration = parser.ReadInt(section, L"FadeDuration", m_FadeDuration);
|
||||
|
||||
group = parser.ReadString(section, L"Group", group.c_str());
|
||||
InitializeGroup(group);
|
||||
m_ConfigGroup = parser.ReadString(section, L"Group", m_ConfigGroup.c_str());
|
||||
|
||||
// On the second loop override settings from the skin's section
|
||||
section = m_SkinName.c_str();
|
||||
@ -1717,6 +1714,9 @@ bool CMeterWindow::ReadSkin()
|
||||
m_Parser.Initialize(iniFile.c_str(), m_Rainmeter, this);
|
||||
|
||||
// Global settings
|
||||
m_ConfigGroup += L"|";
|
||||
m_ConfigGroup += m_Parser.ReadString(L"Rainmeter", L"Group", m_ConfigGroup.c_str());
|
||||
InitializeGroup(m_ConfigGroup);
|
||||
|
||||
// Check the version
|
||||
int appVersion = m_Parser.ReadInt(L"Rainmeter", L"AppVersion", 0);
|
||||
|
Reference in New Issue
Block a user