diff options
author | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-17 13:58:02 +0200 |
---|---|---|
committer | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-18 13:52:21 +0200 |
commit | a1020bdc179c671da510ddc4b92fed66bf9b5c33 (patch) | |
tree | a67f4503b65f5542077de7029c3ce1093dcb53f1 /src/client | |
parent | 9dace67c1bd9b15c9744c78696c791b7fbf7eae8 (diff) | |
download | qtwayland-a1020bdc179c671da510ddc4b92fed66bf9b5c33.tar.gz |
QWaylandWindow: Add a missing shell surface null check.
Caught by tst_QWidget::mapFromAndTo.
Change-Id: I36e08ebfa3bae1ac8667ee828b1762867d71c66d
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/qwaylandwindow.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 6ebe610a..1e40998a 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -657,18 +657,21 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowState state) // here. We use then this mState variable. mState = state; createDecoration(); - switch (state) { - case Qt::WindowFullScreen: - mShellSurface->setFullscreen(); - break; - case Qt::WindowMaximized: - mShellSurface->setMaximized(); - break; - case Qt::WindowMinimized: - mShellSurface->setMinimized(); - break; - default: - mShellSurface->setNormal(); + + if (mShellSurface) { + switch (state) { + case Qt::WindowFullScreen: + mShellSurface->setFullscreen(); + break; + case Qt::WindowMaximized: + mShellSurface->setMaximized(); + break; + case Qt::WindowMinimized: + mShellSurface->setMinimized(); + break; + default: + mShellSurface->setNormal(); + } } QWindowSystemInterface::handleWindowStateChanged(window(), mState); |