[MPlayer-cvslog] r21786 - in trunk/Gui/win32: dialogs.c gui.c

[vayne]

Author: vayne
Date: Fri Dec 29 19:35:22 2006
New Revision: 21786

Modified:
   trunk/Gui/win32/dialogs.c
   trunk/Gui/win32/gui.c

Log:
fix to allow adding multiple files to the playlist with the open file dialog.

Modified: trunk/Gui/win32/dialogs.c
==============================================================================
--- trunk/Gui/win32/dialogs.c	(original)
+++ trunk/Gui/win32/dialogs.c	Fri Dec 29 19:35:22 2006
@@ -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++;

Modified: trunk/Gui/win32/gui.c
==============================================================================
--- trunk/Gui/win32/gui.c	(original)
+++ trunk/Gui/win32/gui.c	Fri Dec 29 19:35:22 2006
@@ -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: