[MPlayer-cvslog] r35446 - in trunk/gui/ui: gtk/fileselect.c gtk/url.c main.c

[ib]

Author: ib
Date: Thu Nov 22 15:13:43 2012
New Revision: 35446

Log:
Don't unconditionally delete the old playlist.

On loading a new file or URL, only delete the old playlist if a new
file or URL has been selected. If the dialog has been cancelled, the
old playlist shall remain.

Modified:
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/ui/gtk/url.c
   trunk/gui/ui/main.c

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Thu Nov 22 15:01:41 2012	(r35445)
+++ trunk/gui/ui/gtk/fileselect.c	Thu Nov 22 15:13:43 2012	(r35446)
@@ -511,6 +511,7 @@ static void fs_Ok_released( GtkButton * 
           selected = g_strconcat(fsSelectedDirectory, "/", fsSelectedFile, NULL);
           if (selected)
           {
+            listMgr(PLAYLIST_DELETE, 0);
             add_to_gui_playlist(selected, PLAYLIST_ITEM_APPEND);
             g_free(selected);
           }

Modified: trunk/gui/ui/gtk/url.c
==============================================================================
--- trunk/gui/ui/gtk/url.c	Thu Nov 22 15:01:41 2012	(r35445)
+++ trunk/gui/ui/gtk/url.c	Thu Nov 22 15:13:43 2012	(r35446)
@@ -103,6 +103,7 @@ static void on_Button_pressed( GtkButton
      listMgr( URLLIST_ITEM_ADD,item );
 
      uiSetFileName( NULL,str,STREAMTYPE_STREAM ); guiInfo.NewPlay=GUI_FILE_NEW;
+     listMgr(PLAYLIST_DELETE, 0);
      add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND);
      uiEventHandling( evPlay,0 );
     }

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Nov 22 15:01:41 2012	(r35445)
+++ trunk/gui/ui/main.c	Thu Nov 22 15:13:43 2012	(r35446)
@@ -141,7 +141,6 @@ void uiEventHandling( int msg,float para
         break;
 
    case evLoadURL:
-        listMgr( PLAYLIST_DELETE,0 );
         gtkShow( evLoadURL,NULL );
 	break;
 
@@ -272,7 +271,6 @@ NoPause:
         uiMainAutoPlay=1;
 //	guiInfo.StreamType=STREAMTYPE_FILE;
    case evLoad:
-	listMgr( PLAYLIST_DELETE,0 );
         gtkShow( evLoad,NULL );
         break;
    case evLoadSubtitle:  gtkShow( evLoadSubtitle,NULL );  break;