From bfa0a1c441e3cae27ef8526fa6bad8711cdb1742 Mon Sep 17 00:00:00 2001
From: vayne <vayne@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 13 Jan 2007 21:20:47 +0000
Subject: [PATCH] proper fix for avoiding file skipping when mplayer is already
 playing a file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21915 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/win32/dialogs.c   | 1 -
 Gui/win32/gui.c       | 3 ---
 Gui/win32/interface.c | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Gui/win32/dialogs.c b/Gui/win32/dialogs.c
index e954d93e7e..60a2d75084 100644
--- a/Gui/win32/dialogs.c
+++ b/Gui/win32/dialogs.c
@@ -529,7 +529,6 @@ static LRESULT CALLBACK PlayListWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
                 case ID_PLAY:
                         if(selected) pl->current = selected - 1;
                         mplSetFileName(NULL, pl->tracks[pl->current]->filename, STREAMTYPE_STREAM);
-                        mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
                         gui->startplay(gui);
                     }
                     return 0;
diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c
index 81b341a896..473606cc1e 100644
--- a/Gui/win32/gui.c
+++ b/Gui/win32/gui.c
@@ -181,10 +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:
             display_opensubtitlewindow(gui);
diff --git a/Gui/win32/interface.c b/Gui/win32/interface.c
index 552f4b26a8..0ce15f89a4 100644
--- a/Gui/win32/interface.c
+++ b/Gui/win32/interface.c
@@ -280,6 +280,7 @@ static void guiSetEvent(int event)
             mplSetFileName(NULL, filename, STREAMTYPE_FILE);
             guiIntfStruct.FilenameChanged = guiIntfStruct.NewPlay = 1;
             update_playlistwindow();
+            mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
             guiGetEvent(guiCEvent, (void *) guiSetStop);
             guiGetEvent(guiCEvent, (void *) guiSetPlay);
             break;