diff options
author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2017-02-03 17:04:03 +0100 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2017-02-16 14:08:52 +0000 |
commit | 262efbc390e58dab4c898a34bb566ea83288601c (patch) | |
tree | 0b8b2eb46bda99ce9e67796d9ae3eb1cc109e95e | |
parent | 0f07709e4249f8d4de299b3af7c5066f3eaf4fd1 (diff) | |
download | qtwayland-262efbc390e58dab4c898a34bb566ea83288601c.tar.gz |
Fix crash when running without shell integration
Change-Id: Ia480913fd9986cbd306858d1fb497e1fb70551f0
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r-- | src/client/qwaylanddisplay.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 851d715b..8e4c8d67 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -421,7 +421,14 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic if (mLastKeyboardFocus == keyboardFocus) return; - mWaylandIntegration->mShellIntegration->handleKeyboardFocusChanged(keyboardFocus, mLastKeyboardFocus); + if (mWaylandIntegration->mShellIntegration) { + mWaylandIntegration->mShellIntegration->handleKeyboardFocusChanged(keyboardFocus, mLastKeyboardFocus); + } else { + if (keyboardFocus) + handleWindowActivated(keyboardFocus); + if (mLastKeyboardFocus) + handleWindowDeactivated(mLastKeyboardFocus); + } mLastKeyboardFocus = keyboardFocus; } |