Mercurial > mplayer.hg
changeset 6857:397e7a1860f9
upsz 2
| author | pontscho |
|---|---|
| date | Wed, 31 Jul 2002 13:26:46 +0000 |
| parents | 23221df30608 |
| children | 21186a5514b4 |
| files | Gui/interface.c Gui/mplayer/play.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 );
--- 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 {