[vlc-commits] Direct3D: destroy the window if any when in desktop wall paper mode

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 20:38:48 2014 +0300| [f56d33ed1664db86aeff2580b66291080c467184] | committer: Rémi Denis-Courmont

Direct3D: destroy the window if any when in desktop wall paper mode

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

 modules/video_output/msw/events.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index d47c9b4..a145abf 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -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);
     }