From 52cbc5b72f7979410ff95e1cc608fb9dc5cda462 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 28 May 2005 21:12:11 +0000
Subject: last patch broke skin reading completely, becasue last line of skin
 file is empty. Fix and simplify, since fgets can do feof's job, too...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15584 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/skin/skin.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Gui')

diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c
index cf25a2827f..5e27d5054e 100644
--- a/Gui/skin/skin.c
+++ b/Gui/skin/skin.c
@@ -686,12 +686,8 @@ int skinRead( char * dname )
  appInitStruct( skinAppMPlayer );
 
  linenumber=0;
- while ( !feof( skinFile ) )
+ while (fgets(tmp, 255, skinFile))
   {
-   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;
@@ -714,5 +710,9 @@ int skinRead( char * dname )
     if ( !strcmp( command,skinItem[i].name ) )
      if ( skinItem[i].func( param ) ) return -2;
   }
+ if (linenumber == 0) {
+   mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SkinFileNotReadable, fn);
+   return -1;
+ }
  return 0;
 }
-- 
cgit v1.2.3