From: Olivier Teulière <ipkiss@videolan.org>
Date: Sun, 14 May 2006 21:43:22 +0000 (+0000)
Subject:  * skins2/parser/skin_parser.cpp: make sure the IDs are unique in the whole skin
X-Git-Tag: 0.9.0-test0~11240
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2a4da6a518aad594032014927cc41404935e921b;p=vlc

 * skins2/parser/skin_parser.cpp: make sure the IDs are unique in the whole skin
---

diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index 09a6dc71fc..a4553b358a 100644
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -78,7 +78,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         RequireDefault( "id" );
         RequireDefault( "file" );
 
-        const BuilderData::IniFile iniFile( attr["id"],
+        const BuilderData::IniFile iniFile( uniqueId( attr["id"] ),
                 attr["file"] );
         m_pData->m_listIniFile.push_back( iniFile );
     }
@@ -122,7 +122,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         CheckDefault( "nbframes", "1" );
         CheckDefault( "fps", "4" );
 
-        const BuilderData::SubBitmap bitmap( attr["id"],
+        const BuilderData::SubBitmap bitmap( uniqueId( attr["id"] ),
                 m_curBitmapId, atoi( attr["x"] ), atoi( attr["y"] ),
                 atoi( attr["width"] ), atoi( attr["height"] ),
                 atoi( attr["nbframes"] ), atoi( attr["fps"] ) );
@@ -135,7 +135,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         RequireDefault( "file" );
         CheckDefault( "type", "digits" );
 
-        const BuilderData::BitmapFont font( attr["id"],
+        const BuilderData::BitmapFont font( uniqueId( attr["id"] ),
                 attr["file"], attr["type"] );
         m_pData->m_listBitmapFont.push_back( font );
     }