aboutsummaryrefslogtreecommitdiffhomepage
path: root/Gui
diff options
context:
space:
mode:
authorGravatar vayne <vayne@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-29 18:35:22 +0000
committerGravatar vayne <vayne@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-29 18:35:22 +0000
commit43592897f20b0c8c39f14928be4509120c8cf0e9 (patch)
tree45ab37a104b443c2385196ba66edb87f3c8ded4f /Gui
parent25c101261b2dfd48721df5597807f751d0fabd08 (diff)
fix to allow adding multiple files to the playlist with the open file dialog.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21786 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/win32/dialogs.c2
-rw-r--r--Gui/win32/gui.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/Gui/win32/dialogs.c b/Gui/win32/dialogs.c
index abfeedcb56..e954d93e7e 100644
--- a/Gui/win32/dialogs.c
+++ b/Gui/win32/dialogs.c
@@ -143,7 +143,7 @@ int display_openfilewindow(gui_t *gui, int add)
{
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++;
diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c
index 473606cc1e..fe018d422f 100644
--- a/Gui/win32/gui.c
+++ b/Gui/win32/gui.c
@@ -181,6 +181,7 @@ static void handlemsg(HWND hWnd, int msg)
case evLoadPlay:
case evLoad:
if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
+ mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
handlemsg(hWnd, evDropFile);
return;
case evLoadSubtitle: