From cfd4a9a6d9a677ac07b5a4dc1678ab250d705a68 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Thu, 12 Aug 2021 22:57:01 +1000
Subject: [PATCH] qt: always update the sink_retrieved flag when the sink
 retrieves

Fixes a case where adding a qmlgloverlay element after an existing
qmlglsink elements was already in the pipeline would create an entirely
separate GstGLDisplay pointing to the same underlying display resource.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1050>
---
 ext/qt/gstqtglutility.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
index 6d413bce25..b38e16fae8 100644
--- a/ext/qt/gstqtglutility.cc
+++ b/ext/qt/gstqtglutility.cc
@@ -85,11 +85,11 @@ gst_qt_get_gl_display (gboolean sink)
       GST_INFO ("returning previously created display");
       G_UNLOCK (display_lock);
       return display;
-    } else if (sink) {
-      sink_retrieved = sink;
     }
     gst_clear_object (&display);
   }
+  if (sink)
+    sink_retrieved = sink;
 
   GST_INFO ("QGuiApplication::instance()->platformName() %s", app->platformName().toUtf8().data());