From 5a278dd42a9fa6a27dca3a6ec1f8ada3c433a780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Wed, 27 Aug 2014 23:06:48 +0100
Subject: Android: Fix crash at shutdown when keyboard is visible

This is a follow-up to 4c6ebe5f9e4ddc0d799a0f2bf4aef9f7e48e0dfb.
Crash was still 100% reproducible for me with the previous fix.

Task-number: QTBUG-40957
Change-Id: Ie59cfe4f1fc746251fe06ba96369738098b2a35f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/plugins/platforms/android/androidjniinput.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp
index defc59abf0..cd0659227d 100644
--- a/src/plugins/platforms/android/androidjniinput.cpp
+++ b/src/plugins/platforms/android/androidjniinput.cpp
@@ -47,6 +47,7 @@
 #include <QTouchEvent>
 #include <QPointer>
 
+#include <QGuiApplication>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
@@ -716,7 +717,7 @@ namespace QtAndroidInput
     static void keyboardVisibilityChanged(JNIEnv */*env*/, jobject /*thiz*/, jboolean /*visibility*/)
     {
         QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext();
-        if (inputContext)
+        if (inputContext && qGuiApp)
             inputContext->emitInputPanelVisibleChanged();
 #ifdef QT_DEBUG_ANDROID_IM_PROTOCOL
         qDebug() << "@@@ KEYBOARDVISIBILITYCHANGED" << inputContext;
-- 
cgit v1.2.3