# HG changeset patch
# User pontscho
# Date 1028122006 0
# Node ID 397e7a1860f95af5aec6d8a5334f25f56b50e049
# Parent  23221df3060851f78f23aa80ac857e52060fe4e2
upsz 2

diff -r 23221df30608 -r 397e7a1860f9 Gui/interface.c
--- a/Gui/interface.c	Wed Jul 31 05:25:57 2002 +0000
+++ b/Gui/interface.c	Wed Jul 31 13:26:46 2002 +0000
@@ -84,7 +84,7 @@
  gtkAOOSSDevice=strdup( PATH_DEV_DSP );
  cfg_read();
  appInit( (void*)mDisplay );
- if ( plCurrent ) mplSetFileName( plCurrent->path,plCurrent->name );
+ if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
 #if defined( USE_OSD ) || defined( USE_SUB )
  guiLoadFont();
 #endif
@@ -315,7 +315,7 @@
 #endif
 	break;
    case guiSetDefaults:
-	if ( filename && gstrcmp( filename,guiIntfStruct.Filename ) )
+	if ( filename && !guiIntfStruct.Filename )
 	 {
 	  gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE;
 	  guiSetFilename( guiIntfStruct.Filename,filename );
diff -r 23221df30608 -r 397e7a1860f9 Gui/mplayer/play.c
--- a/Gui/mplayer/play.c	Wed Jul 31 05:25:57 2002 +0000
+++ b/Gui/mplayer/play.c	Wed Jul 31 13:26:46 2002 +0000
@@ -97,8 +97,8 @@
    guiSetDF( guiIntfStruct.Filename,next->path,next->name );
    guiIntfStruct.StreamType=STREAMTYPE_FILE;
    guiIntfStruct.FilenameChanged=1;
-   if ( guiIntfStruct.AudioFile ) free( guiIntfStruct.AudioFile );
-   guiIntfStruct.AudioFile=NULL;
+   gfree( (void **)&guiIntfStruct.AudioFile );
+   gfree( (void **)&guiIntfStruct.Subtitlename );
   } 
   else
     {