diff options
author | wm4 <wm4@nowhere> | 2014-10-09 21:24:47 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-09 21:26:03 +0200 |
commit | a13e01cc3ef1a8de0ce3a4c79dd75dccd18c4ebb (patch) | |
tree | a06f83e9ec7d49eafe46948e4131c1266967eb6d | |
parent | e96d6197d7f675c7fb8121614290435078f570f8 (diff) | |
download | mpv-a13e01cc3ef1a8de0ce3a4c79dd75dccd18c4ebb.tar.bz2 mpv-a13e01cc3ef1a8de0ce3a4c79dd75dccd18c4ebb.tar.xz |
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.
-rw-r--r-- | video/out/x11_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |