github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity

Print error when skin file is not readable (e.g. a directory) instead of hanging

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15555 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-05-23 20:12:47 +00:00
parent 4499002cf9
commit 7fac308569
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gui/skin/skin.c
View File

@ -688,7 +688,11 @@ int skinRead( char * dname )
linenumber=0;
while ( !feof( skinFile ) )
{
fgets( tmp,255,skinFile ); linenumber++;
if (!fgets( tmp,255,skinFile )) {
mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SkinFileNotReadable, fn);
return -1;
}
linenumber++;
c=tmp[ strlen( tmp ) - 1 ]; if ( c == '\n' || c == '\r' ) tmp[ strlen( tmp ) - 1 ]=0;
c=tmp[ strlen( tmp ) - 1 ]; if ( c == '\n' || c == '\r' ) tmp[ strlen( tmp ) - 1 ]=0;

1
help/help_mp-en.h
View File

@ -641,6 +641,7 @@ static char help_text[]=
#define MSGTR_SKIN_WARNING2 "[skin] warning in config file line %d:\nwidget (%s) found but no \"subsection\" found before"
#define MSGTR_SKIN_WARNING3 "[skin] warning in config file line %d:\nthis subsection is not supported by widget (%s)"
#define MSGTR_SKIN_SkinFileNotFound "[skin] file ( %s ) not found.\n"
#define MSGTR_SKIN_SkinFileNotReadable "[skin] file ( %s ) not readable.\n"
#define MSGTR_SKIN_BITMAP_16bit "16 bits or less depth bitmap not supported (%s).\n"
#define MSGTR_SKIN_BITMAP_FileNotFound "file not found (%s)\n"
#define MSGTR_SKIN_BITMAP_BMPReadError "BMP read error (%s)\n"