actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix it used stale

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-04 22:38:59 +00:00
parent 922f36f546
commit 4acc41f47c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+5 -5
View File
@@ -273,18 +273,18 @@ static void MergeIniUnder( XNode *pFrom, XNode *pTo )
/* If this node doesn't exist in pTo, just move the whole node. */
XNode *pChildNode = pTo->GetChild( it->first );
XNode *pSectionNode = it->second;
if( pChildNode == NULL )
{
pFrom->RemoveChild( it->second, false ); // don't delete
pTo->AppendChild( it->second );
pFrom->RemoveChild( pSectionNode, false ); // don't delete
pTo->AppendChild( pSectionNode );
}
else
{
XNode *pFrom = it->second;
FOREACHM( RString, XNodeValue *, pFrom->m_attrs, it )
FOREACHM( RString, XNodeValue *, pSectionNode->m_attrs, it2 )
{
/* Don't overwrite existing nodes. */
pChildNode->AppendAttr( it->first, it->second, false );
pChildNode->AppendAttr( it2->first, it2->second, false );
}
}