summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylanddisplay.cpp
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-04-23 19:32:28 +0300
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-05-28 07:48:22 +0000
commit817c7e0c365e9b0e2b9d4f3ed06dd192a57bd6af (patch)
tree5b84cf28217b9ab11ebee07fb73a39e71f77b3aa /src/client/qwaylanddisplay.cpp
parentf87e9e28aaa37888baa3c530d74c61f8c5826ef1 (diff)
Fix crash when the wl_shm global comes after a wl_output one
Task-number: QTBUG-44503 Change-Id: I6932df57bb4560b6dceb72a5cb7c536cd090e92a Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
-rw-r--r--src/client/qwaylanddisplay.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index e0155fc95..c3925f5c4 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -239,6 +239,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
mScreens.append(screen);
// We need to get the output events before creating surfaces
forceRoundTrip();
+ screen->init();
mWaylandIntegration->screenAdded(screen);
} else if (interface == QStringLiteral("wl_compositor")) {
mCompositorVersion = qMin((int)version, 3);