]> git.sesse.net Git - vlc/commitdiff
caca: check that the vout is not windowed
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 14 Oct 2014 19:42:02 +0000 (22:42 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 16 Oct 2014 17:23:39 +0000 (20:23 +0300)
modules/video_output/caca.c

index 4e114e0ee10c4b0c13209bb529e2741b6cbb73d9..05d854bdcae63322c256c4f1f2a0c3c9209904e9 100644 (file)
@@ -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,