Fix crash when calling setVisible for EGL windows twice within one slot

Task-number: QTBUG-63411
Change-Id: I56c367a1801d215e93bf195332272cfee300cdd8
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

3 files changed, 19 insertions, 11 deletions

diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index 870b71c1a..3b9001475 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -160,12 +160,6 @@ void QWaylandEglWindow::setVisible(bool visible)
 {
     QWaylandWindow::setVisible(visible);
     if (!visible)
-        QMetaObject::invokeMethod(this, "doInvalidateSurface", Qt::QueuedConnection);
-}
-
-void QWaylandEglWindow::doInvalidateSurface()
-{
-    if (!window()->isVisible())
         invalidateSurface();
 }
 
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index c5ba072a0..88e893a74 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -77,9 +77,6 @@ public:
     void invalidateSurface() override;
     void setVisible(bool visible) override;
 
-private Q_SLOTS:
-    void doInvalidateSurface();
-
 private:
     QWaylandEglClientBufferIntegration *m_clientBufferIntegration = nullptr;
     struct wl_egl_window *m_waylandEglWindow = nullptr;
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 1e3d0f1d1..05b8bac1a 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -113,7 +113,10 @@ class TestGlWindow : public QOpenGLWindow
 
 public:
     TestGlWindow();
-    uint paintGLCalled = 0;
+    int paintGLCalled = 0;
+
+public slots:
+    void hideShow();
 
 protected:
     void paintGL() override;
@@ -122,6 +125,12 @@ protected:
 TestGlWindow::TestGlWindow()
 {}
 
+void TestGlWindow::hideShow()
+{
+    setVisible(false);
+    setVisible(true);
+}
+
 void TestGlWindow::paintGL()
 {
     glClear(GL_COLOR_BUFFER_BIT);
@@ -564,7 +573,15 @@ void tst_WaylandClient::glWindow()
     QTRY_VERIFY(surface = compositor->surface());
     compositor->sendShellSurfaceConfigure(surface);
 
-    QTRY_VERIFY(testWindow->paintGLCalled);
+    QTRY_COMPARE(testWindow->paintGLCalled, 1);
+
+    //QTBUG-63411
+    QMetaObject::invokeMethod(testWindow.data(), "hideShow", Qt::QueuedConnection);
+    testWindow->requestUpdate();
+    QTRY_COMPARE(testWindow->paintGLCalled, 2);
+
+    testWindow->requestUpdate();
+    QTRY_COMPARE(testWindow->paintGLCalled, 3);
 
     //confirm we don't crash when we delete an already hidden GL window
     //QTBUG-65553