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

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 20:38:48 2014 +0300| [09ba0061ac999c6619dc3c62b064709590132b69] | committer: Jean-Baptiste Kempf

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

(Manual cherry picked from commit f56d33ed1664db86aeff2580b66291080c467184)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

Close #13647

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 64b23fe..dfa5095 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -681,18 +681,19 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
 
     #ifdef MODULE_NAME_IS_direct3d
     if( !p_event->use_desktop )
-    {
     #endif
+    {
         /* If an external window was specified, we'll draw in it. */
         p_event->parent_window = vout_display_NewWindow(vd, &p_event->wnd_cfg );
         if( p_event->parent_window )
             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);
     }