diff mplayer.c @ 3543:5a11cbf8791f

some small sub bug fix
author pontscho
date Mon, 17 Dec 2001 00:07:20 +0000
parents 1bfa5284f160
children 1dbf58c3d50c
line wrap: on
line diff
--- a/mplayer.c	Mon Dec 17 00:03:50 2001 +0000
+++ b/mplayer.c	Mon Dec 17 00:07:20 2001 +0000
@@ -663,13 +663,17 @@
 	usleep(20000);
 	EventHandling();
       }
-      if(mplShMem->FilenameChanged){
-        filename=mplShMem->Filename;
-      }
+      
 #ifdef USE_SUB
-      sub_name=NULL;
-      if ( mplShMem->SubtitleChanged ) sub_name=mplShMem->Subtitlename;
+      if ( mplShMem->SubtitleChanged || !mplShMem->FilenameChanged )
+       { sub_name=mplShMem->Subtitlename; mplShMem->SubtitleChanged=0; }
 #endif
+
+      if ( mplShMem->FilenameChanged || !filename )
+       {
+        filename=mplShMem->Filename;
+	mplShMem->FilenameChanged=0;
+       }
     }
 #endif
 
@@ -2178,7 +2182,15 @@
 
   current_module="free_stream";
   if(stream) free_stream(stream);
-
+  
+  current_module="sub_free";
+  if ( subtitles ) 
+   {
+    sub_free( subtitles );
+    sub_name=NULL;
+    vo_sub=NULL;
+   }
+  
   video_out=NULL;
   audio_out=NULL;