[vlc-commits] Revert "msw(Win32): properly terminate vlc when SC_CLOSE received"

Rémi Denis-Courmont git at videolan.org
Sat Jan 29 09:58:16 CET 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 29 10:58:01 2011 +0200| [130cdb2dbce501a100ae0f08cd4c406746cee3c0] | committer: Rémi Denis-Courmont

Revert "msw(Win32): properly terminate vlc when SC_CLOSE received"

This reverts commit 7b18ec43935a5e70ee8506b2fcb3e230b78b44d4.
This broke LibVLC and wall.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=130cdb2dbce501a100ae0f08cd4c406746cee3c0
---

 modules/video_output/msw/events.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 937d800..def6f7e 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -33,7 +33,6 @@
 #include <vlc_common.h>
 #include <vlc_vout_display.h>
 #include <vlc_vout_window.h>
-#include <vlc_interface.h>
 
 #include <windows.h>
 #include <windowsx.h>
@@ -747,15 +746,6 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
     }
     vout_display_t *vd = p_event->vd;
 
-    /* Close requested by user */
-    if( message == WM_SYSCOMMAND &&
-        (wParam & 0xFFF0) == SC_CLOSE )
-    {
-        msg_Dbg( vd, "SC_CLOSE received, leaving vlc" );
-        libvlc_Quit( vd->p_libvlc );
-        return 0;
-    }
-
 #ifndef UNDER_CE
     /* Catch the screensaver and the monitor turn-off */
     if( message == WM_SYSCOMMAND &&



More information about the vlc-commits mailing list