]> git.sesse.net Git - vlc/commitdiff
Direct3D: destroy the window if any when in desktop wall paper mode
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 11 Oct 2014 17:38:48 +0000 (20:38 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 16 Oct 2014 17:23:38 +0000 (20:23 +0300)
modules/video_output/msw/events.c

index d47c9b4505e858fa6685f03785b26569982d3622..a145abf19e81443e44652925192de94c4c485330 100644 (file)
@@ -683,8 +683,8 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
 
     #ifdef MODULE_NAME_IS_direct3d
     if( !p_event->use_desktop )
-    {
     #endif
+    {
         vout_window_cfg_t wnd_cfg = {
             .type = VOUT_WINDOW_TYPE_HWND,
             .width = p_event->width,
@@ -697,10 +697,11 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
             p_event->hparent = p_event->parent_window->handle.hwnd;
         else
             p_event->hparent = NULL;
-    #ifdef MODULE_NAME_IS_direct3d
     }
+    #ifdef MODULE_NAME_IS_direct3d
     else
     {
+        vout_display_DeleteWindow(vd, NULL);
         p_event->parent_window = NULL;
         p_event->hparent = GetDesktopHandle(vd);
     }