From a13e01cc3ef1a8de0ce3a4c79dd75dccd18c4ebb Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 9 Oct 2014 21:24:47 +0200 Subject: x11: fix inverted condition Worryingly wrong. Fixes #1162. Also fix another issue (window title was set anyway), which was why I didn't notice this and testing it seemed to be fine. --- video/out/x11_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'video/out') diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 79220d743f..a9dc5f4aa5 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -1222,7 +1222,7 @@ static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, NULL); } - if (vo->opts->WinID >= 0) { + if (vo->opts->WinID < 0) { vo_x11_set_wm_icon(x11); vo_x11_update_window_title(vo); vo_x11_dnd_init_window(vo); @@ -1593,7 +1593,8 @@ int vo_x11_control(struct vo *vo, int *events, int request, void *arg) set_screensaver(x11, true); return VO_TRUE; case VOCTRL_UPDATE_WINDOW_TITLE: - vo_x11_update_window_title(vo); + if (vo->opts->WinID < 0) + vo_x11_update_window_title(vo); return VO_TRUE; case VOCTRL_GET_DISPLAY_FPS: { double fps = x11->current_display_fps; -- cgit v1.2.3