git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6858 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2002-07-31 13:26:46 +00:00
parent 0b4294fe82
commit 0246dff153
2 changed files with 4 additions and 4 deletions

View File

@ -84,7 +84,7 @@ void guiInit( void )
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 @@ void guiGetEvent( int type,char * arg )
#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 );

View File

@ -97,8 +97,8 @@ void mplEnd( void )
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
{