Skip to content

V
vlc-1.1
Commit 85e1d25b authored by Olivier Teulière's avatar Olivier Teulière
Browse files
Options

* skins2/parser/skin_parser.cpp: Make sure that IDs are unique

parent 7fecd439
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/gui/skins2/parser/skin_parser.cpp
View file @ 85e1d25b
......@@ -104,7 +104,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "Bitmap" )
{
const BuilderData::Bitmap bitmap( attr["id"] ,
const BuilderData::Bitmap bitmap( uniqueId( attr["id"] ),
convertFileName( attr["file"] ),
convertColor( attr["alphacolor"] ) );
m_data.m_listBitmap.push_back( bitmap );
......@@ -112,7 +112,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "BitmapFont" )
{
const BuilderData::BitmapFont font( attr["id"],
const BuilderData::BitmapFont font( uniqueId( attr["id"] ),
convertFileName( attr["file"] ),
attr["type"] );
m_data.m_listBitmapFont.push_back( font );
......@@ -144,7 +144,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "Font" )
{
const BuilderData::Font fontData( attr["id"],
const BuilderData::Font fontData( uniqueId( attr["id"] ),
convertFileName( attr["file"] ),
atoi( attr["size"] ) );
m_data.m_listFont.push_back( fontData );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment