From 542c6392ca52f86bd5fffb6141e93ad2a1ab8fcb Mon Sep 17 00:00:00 2001
From: Giulio Camuffo <giulio.camuffo@kdab.com>
Date: Sat, 2 Jul 2016 10:57:16 +0200
Subject: Add xdg_shell_v6 support for Qt clients

Task-number: QTBUG-56174
Change-Id: I6610905d0c9f29be29e812bcac193ea2a7e4f107
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 src/client/qwaylandinputcontext.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/client/qwaylandinputcontext.cpp')

diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index 5a58d6d75..dcc4ad5c7 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -532,7 +532,8 @@ void QWaylandInputContext::setFocusObject(QObject *)
     if (mCurrentWindow && mCurrentWindow->handle()) {
         if (mCurrentWindow.data() != window || !inputMethodAccepted()) {
             struct ::wl_surface *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->object();
-            textInput()->disable(surface);
+            if (surface)
+                textInput()->disable(surface);
             mCurrentWindow.clear();
         }
     }
-- 
cgit v1.2.3