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 to 720ed17: Now the sections that the included file has are placed to the last position if @include is placed on the last section in the original file.

Browse Source
This commit is contained in:
spx 2012-07-20 02:33:52 -07:00
parent 071b6f78bb
commit b66875d8ad
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/ConfigParser.cpp
View File

@ -1326,13 +1326,24 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile, LPCTSTR skinSection
if (resetInsertPos) if (resetInsertPos)
{ {
for (auto it = m_Sections.cbegin(); it != m_Sections.cend(); ++it) auto jt = iter;
if (++jt == sections.end()) // Special case: @include was used in the last section of the current file
{ {
if (_wcsicmp((*it).c_str(), sectionName) == 0) // Set the insertion place to the last
m_SectionInsertPos = m_Sections.end();
resetInsertPos = false;
}
else
{
// Find the appropriate insertion place
for (auto it = m_Sections.cbegin(); it != m_Sections.cend(); ++it)
{ {
m_SectionInsertPos = ++it; if (_wcsicmp((*it).c_str(), sectionName) == 0)
resetInsertPos = false; {
break; m_SectionInsertPos = ++it;
resetInsertPos = false;
break;
}
} }
} }
} }