diff options
| author | Vyacheslav Koscheev <v.koscheev@2gis.ru> | 2019-01-16 13:11:37 +0700 |
|---|---|---|
| committer | Vyacheslav Koscheev <vok1980@gmail.com> | 2019-01-17 03:19:17 +0000 |
| commit | 83aa70f0ca5e5c7427a3493c4d3dbc398735a5df (patch) | |
| tree | 8738e75b4ae76274590f26fcb69b93955bd43361 | |
| parent | ccfd6872badaed768df14076dc46afcb2b3c861a (diff) | |
Android: fix NPE on m_editPopupMenu
Change-Id: Id6d4aea91d621194cf85f604b1b9acdc916bede1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 74b515ef5b..02033859e9 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -506,7 +506,8 @@ public class QtActivityDelegate m_rightSelectionHandle = null; m_leftSelectionHandle = null; } - m_editPopupMenu.hide(); + if (m_editPopupMenu != null) + m_editPopupMenu.hide(); break; case CursorHandleShowNormal: @@ -561,7 +562,8 @@ public class QtActivityDelegate } m_editPopupMenu.setPosition(editX, editY, editButtons); } else { - m_editPopupMenu.hide(); + if (m_editPopupMenu != null) + m_editPopupMenu.hide(); } } |