[vlc-commits] caca: check that the vout is not windowed

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 14 22:42:02 2014 +0300| [42b0285a57f03d41eb64bc3e168371a5c3588646] | committer: Rémi Denis-Courmont

caca: check that the vout is not windowed

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

 modules/video_output/caca.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 4e114e0..05d854b 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -88,6 +88,8 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;
 #if !defined(__APPLE__) && !defined(_WIN32)
 # ifndef X_DISPLAY_MISSING
     if (!vlc_xlib_init(object))
@@ -166,7 +168,6 @@ 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,