Mercurial > mplayer.hg

changeset 21770:7b549b0ee467

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix to allow adding multiple files to the playlist with the open file dialog.
author vayne
date Fri, 29 Dec 2006 18:35:22 +0000
parents c9d6c2d5c320
children 4f317822d1fc
files Gui/win32/dialogs.c Gui/win32/gui.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/win32/dialogs.c	Fri Dec 29 14:15:40 2006 +0000
+++ b/Gui/win32/dialogs.c	Fri Dec 29 18:35:22 2006 +0000
@@ -143,7 +143,7 @@
             {
                 if (GetFullPathName(filename, MAX_PATH, filename, &filepart))
                 {
-                    if(!parse_filename(filename, playtree, mconfig, add? 0 : 1))
+                    if(!parse_filename(filename, playtree, mconfig, 0))
                         gui->playlist->add_track(gui->playlist, filename, NULL, filepart, 0);
                     mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Adding file: %s - path %s\n", filespec, filename);
                     result++;
--- a/Gui/win32/gui.c	Fri Dec 29 14:15:40 2006 +0000
+++ b/Gui/win32/gui.c	Fri Dec 29 18:35:22 2006 +0000
@@ -181,6 +181,7 @@
         case evLoadPlay:
         case evLoad:
             if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
+                mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
                 handlemsg(hWnd, evDropFile);
             return;
         case evLoadSubtitle: