From e2731f35bfd59f77b22f2d8d188939664423d4f5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 16 May 2016 15:26:53 -0400 Subject: [PATCH] gl: win32: Don't steal parent focus when creating internal window This fix regression introduced by 0acc18c60f6f962cc6553f6047fdb64891bab544. https://bugzilla.gnome.org/show_bug.cgi?id=766520 --- gst-libs/gst/gl/win32/gstglwindow_win32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32.c b/gst-libs/gst/gl/win32/gstglwindow_win32.c index 1ff18bbad8..fca265718c 100644 --- a/gst-libs/gst/gl/win32/gstglwindow_win32.c +++ b/gst-libs/gst/gl/win32/gstglwindow_win32.c @@ -285,7 +285,12 @@ gst_gl_window_win32_create_window (GstGLWindowWin32 * window_win32, GST_LOG ("Created a win32 window"); - set_parent_win_id (window_win32); + /* The window has been created as if it had no parent, so there is nothing + * else to do in that case. Even if user has already set a window, + * parent_win_id could still be 0 at this point, and in that case calling + * set_parent_win_id() here would steal focus from the parent window. */ + if (window_win32->parent_win_id) + set_parent_win_id (window_win32); return TRUE;