1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix crash at shutdown when keyboard is visible

Browse Source 
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>
This commit is contained in:
Sérgio Martins 2014-08-27 23:06:48 +01:00 committed by Paul Olav Tvete
parent 41826cfbae
commit 5a278dd42a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/android/androidjniinput.cpp
View File

@ -47,6 +47,7 @@
#include <QTouchEvent> #include <QTouchEvent>
#include <QPointer> #include <QPointer>
#include <QGuiApplication>
#include <QDebug> #include <QDebug>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -716,7 +717,7 @@ namespace QtAndroidInput
static void keyboardVisibilityChanged(JNIEnv */*env*/, jobject /*thiz*/, jboolean /*visibility*/) static void keyboardVisibilityChanged(JNIEnv */*env*/, jobject /*thiz*/, jboolean /*visibility*/)
{ {
QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext(); QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext();
if (inputContext) if (inputContext && qGuiApp)
inputContext->emitInputPanelVisibleChanged(); inputContext->emitInputPanelVisibleChanged();
#ifdef QT_DEBUG_ANDROID_IM_PROTOCOL #ifdef QT_DEBUG_ANDROID_IM_PROTOCOL
qDebug() << "@@@ KEYBOARDVISIBILITYCHANGED" << inputContext; qDebug() << "@@@ KEYBOARDVISIBILITYCHANGED" << inputContext;