Commit f2ecf48f authored by Olivier Teulière's avatar Olivier Teulière

* skins2/parser/skin_parser.cpp: Fixed a crash due to incomplete backports....

 * skins2/parser/skin_parser.cpp: Fixed a crash due to incomplete backports. Also fixed another problem of the same kind.
parent 6d34532b
...@@ -311,6 +311,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -311,6 +311,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
RequireDefault( "id" ); RequireDefault( "id" );
RequireDefault( "font" ); RequireDefault( "font" );
CheckDefault( "visible", "true" ); CheckDefault( "visible", "true" );
CheckDefault( "flat", "true" ); // only difference here
CheckDefault( "x", "0" ); CheckDefault( "x", "0" );
CheckDefault( "y", "0" ); CheckDefault( "y", "0" );
CheckDefault( "width", "0" ); CheckDefault( "width", "0" );
...@@ -320,6 +321,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -320,6 +321,9 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
CheckDefault( "xkeepratio", "false" ); CheckDefault( "xkeepratio", "false" );
CheckDefault( "ykeepratio", "false" ); CheckDefault( "ykeepratio", "false" );
CheckDefault( "bgimage", "none" ); CheckDefault( "bgimage", "none" );
CheckDefault( "itemimage", "none" );
CheckDefault( "openimage", "none" );
CheckDefault( "closedimage", "none" );
CheckDefault( "fgcolor", "#000000" ); CheckDefault( "fgcolor", "#000000" );
CheckDefault( "playcolor", "#FF0000" ); CheckDefault( "playcolor", "#FF0000" );
CheckDefault( "bgcolor1", "#FFFFFF" ); CheckDefault( "bgcolor1", "#FFFFFF" );
...@@ -543,6 +547,10 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -543,6 +547,10 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
else if( rName == "ThemeInfo" ) else if( rName == "ThemeInfo" )
{ {
CheckDefault( "name", "" );
CheckDefault( "author", "" );
CheckDefault( "email", "" );
CheckDefault( "website", "" );
msg_Info( getIntf(), "skin: %s author: %s", attr["name"], msg_Info( getIntf(), "skin: %s author: %s", attr["name"],
attr["author"] ); attr["author"] );
} }
......
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