Merge 5.9 into 5.9.2v5.9.2

Change-Id: Ia35d6229b7c9889bdbaea72decc78e927ca0f2db

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp
index f66095a7d..4c73c26a3 100644
--- a/src/gsttools/qgstvideorenderersink.cpp
+++ b/src/gsttools/qgstvideorenderersink.cpp
@@ -247,13 +247,11 @@ GstFlowReturn QVideoSurfaceGstDelegate::render(GstBuffer *buffer)
     m_renderReturn = GST_FLOW_OK;
     m_renderBuffer = buffer;
 
-    GstFlowReturn flowReturn = waitForAsyncEvent(&locker, &m_renderCondition, 300)
-                                                ? m_renderReturn
-                                                : GST_FLOW_ERROR;
+    waitForAsyncEvent(&locker, &m_renderCondition, 300);
 
     m_renderBuffer = 0;
 
-    return flowReturn;
+    return m_renderReturn;
 }
 
 bool QVideoSurfaceGstDelegate::event(QEvent *event)