msw(Win32): properly terminate vlc when SC_CLOSE received

[vlc] / modules / video_output / msw / events.c

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index def6f7edc310384b027aa8d8118da182f987ae30..937d8002e110ea5c5544eeb908ec16833a113bc7 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_vout_display.h>
 #include <vlc_vout_window.h>
+#include <vlc_interface.h>
 
 #include <windows.h>
 #include <windowsx.h>
@@ -746,6 +747,15 @@ 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 &&