From df56e83ed9d78388a057bf58768dd6f60034aa28 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 14 Aug 2003 01:54:27 +0000 Subject: Fixed a long standing issue: if configured a not available (not existing, permission denied, ...) skin, the gui never ever started again. Now it reverts to 'default' if it can't open the selected skin, if 'default' fails too, the gui exits with error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10608 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/interface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Gui') diff --git a/Gui/interface.c b/Gui/interface.c index e52154ff7a..2ef5945fc6 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -186,8 +186,14 @@ void guiInit( void ) printf("SKIN dir 1: '%s'\n",skinDirInHome); printf("SKIN dir 2: '%s'\n",skinMPlayerDir); if ( !skinName ) skinName=strdup( "default" ); - switch ( skinRead( skinName ) ) - { + i = skinRead( skinName ); + if ((i == -1) && strcmp(skinName,"default")) + { + mp_msg( MSGT_GPLAYER,MSGL_INFO,"Selected skin ( %s ) not found, trying 'default'...\n", skinName); + skinName=strdup( "default" ); + i = skinRead( skinName ); + } + switch (i) { case -1: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinNotFound,skinName ); exit( 0 ); case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 ); } -- cgit v1.2.3