diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-28 14:12:34 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-03-23 08:36:54 +0000 |
| commit | 6bd1d22475a10e84f2bcc1eaa25bd7fb259e761b (patch) | |
| tree | 0aef788bbb6c4d3b222afb5a5b2176982e3e1613 /src/hardwareintegration | |
| parent | d29cbc2a0604f1b9a35f480a63a2472ca9e54661 (diff) | |
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>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp | 6 | ||||
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h | 3 |
2 files changed, 0 insertions, 9 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; |