diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-14 01:54:27 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-14 01:54:27 +0000 |
| commit | df56e83ed9d78388a057bf58768dd6f60034aa28 (patch) | |
| tree | ef3481689aa3dea4dc2a51463e421d2e4ca84ab2 /Gui | |
| parent | 56059cf2bd6fda9376602ba75ee5c7eff5244411 (diff) | |
| download | mpv-df56e83ed9d78388a057bf58768dd6f60034aa28.tar.bz2 mpv-df56e83ed9d78388a057bf58768dd6f60034aa28.tar.xz | |
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
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/interface.c | 10 |
1 files changed, 8 insertions, 2 deletions
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 ); } |