diff options
author | Sérgio Martins <sergio.martins@kdab.com> | 2014-08-27 23:06:48 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@digia.com> | 2014-08-28 13:48:39 +0200 |
commit | 5a278dd42a9fa6a27dca3a6ec1f8ada3c433a780 (patch) | |
tree | b09223479595f1b93d840436a3855c0e210a64d4 | |
parent | 41826cfbae4569255c78ea5ade2a4b7ed9a2dfe1 (diff) |
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>
-rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |