print help before reading font+sub

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@426 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 23 insertions, 24 deletions

diff --git a/mplayer.c b/mplayer.c
index b2ec49bf5b..3e7fca5366 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -452,24 +452,12 @@ if(video_driver && strcmp(video_driver,"help")==0){
   exit(0);
 }
 
-// check font
-  if(font_name){
-       vo_font=read_font_desc(font_name,font_factor,verbose>1);
-       if(!vo_font) printf("Can't load font: %s\n",font_name);
-  } else {
-      // try default:
-       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
-  }
-
-// check .sub
-  if(sub_name){
-       subtitles=sub_read_file(sub_name);
-       if(!subtitles) printf("Can't load subtitles: %s\n",font_name);
-  } else {
-      // try default:
-       subtitles=sub_read_file(get_path("default.sub"));
+if(!filename){
+  if(vcd_track) filename="/dev/cdrom"; 
+  else {
+    printf("%s",help_text); exit(0);
   }
-
+}
 
 // check video_out driver name:
   if(!video_driver)
@@ -486,19 +474,30 @@ if(video_driver && strcmp(video_driver,"help")==0){
     return 0;
   }
 
-if(!filename){
-  if(vcd_track) filename="/dev/cdrom"; 
-  else {
-    printf("%s",help_text); exit(0);
-  }
-}
-
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
     printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
     exit(1);
 }
 
+// check font
+  if(font_name){
+       vo_font=read_font_desc(font_name,font_factor,verbose>1);
+       if(!vo_font) printf("Can't load font: %s\n",font_name);
+  } else {
+      // try default:
+       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
+  }
+
+// check .sub
+  if(sub_name){
+       subtitles=sub_read_file(sub_name);
+       if(!subtitles) printf("Can't load subtitles: %s\n",font_name);
+  } else {
+      // try default:
+       subtitles=sub_read_file(get_path("default.sub"));
+  }
+
 
 if(vcd_track){
 //============ Open VideoCD track ==============