From: Laurent Aimar <fenrir@videolan.org>
Date: Thu, 20 May 2010 21:14:02 +0000 (+0200)
Subject: Called vout_display_DeleteWindow(vd, NULL) for vout display not using vout window.
X-Git-Tag: 1.2.0-pre1~6574
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=710b39fa1171600d86706da279b6da2155eb0061;p=vlc

Called vout_display_DeleteWindow(vd, NULL) for vout display not using vout window.
---

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 925ecb3ad4..5c446284ec 100644
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -97,6 +97,7 @@ static int Open(vlc_object_t *object)
         msg_Err(vd, "cannot initialize aalib");
         goto error;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     aa_autoinitkbd(sys->aa_context, 0);
     aa_autoinitmouse(sys->aa_context, AA_MOUSEALLMASK);
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 63a0d0fc94..6de1ca19a2 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -153,6 +153,7 @@ static int Open(vlc_object_t *object)
         msg_Err(vd, "cannot initialize libcaca");
         goto error;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     if (vd->cfg->display.title)
         caca_set_display_title(sys->dp,
diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 1fc57d5138..fd18cbbe90 100644
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -108,6 +108,7 @@ static int Open(vlc_object_t *object)
         Close(VLC_OBJECT(vd));
         return VLC_EGENERIC;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     /* */
     video_format_t fmt = vd->fmt;
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 1426ad9bab..7e25456d7b 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -251,6 +251,7 @@ static int Open(vlc_object_t *object)
         Close(VLC_OBJECT(vd));
         return VLC_EGENERIC;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     /* */
     video_format_t fmt = vd->fmt;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 3394a77ede..0fdcaf41cc 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -127,6 +127,7 @@ static int Open(vlc_object_t *this)
         msg_Dbg(vd, "No drawable-nsobject, passing over.");
         goto error;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     /* This will be released in Close(), on
      * main thread, after we are done using it. */
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index ea78cfe285..17448a0e76 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -180,6 +180,7 @@ static int Open(vlc_object_t *object)
         msg_Err(vd, "no video mode available");
         goto error;
     }
+    vout_display_DeleteWindow(vd, NULL);
 
     sys->display = SDL_SetVideoMode(display_width, display_height,
                                     sys->display_bpp, sys->display_flags);