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

Android: fix NPE on m_editPopupMenu

Browse Source 
Change-Id: Id6d4aea91d621194cf85f604b1b9acdc916bede1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Vyacheslav Koscheev 2019-01-16 13:11:37 +07:00 committed by Vyacheslav Koscheev
parent ccfd6872ba
commit 83aa70f0ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
View File

@ -506,7 +506,8 @@ public class QtActivityDelegate
m_rightSelectionHandle = null; m_rightSelectionHandle = null;
m_leftSelectionHandle = null; m_leftSelectionHandle = null;
} }
m_editPopupMenu.hide(); if (m_editPopupMenu != null)
m_editPopupMenu.hide();
break; break;
case CursorHandleShowNormal: case CursorHandleShowNormal:
@ -561,7 +562,8 @@ public class QtActivityDelegate
} }
m_editPopupMenu.setPosition(editX, editY, editButtons); m_editPopupMenu.setPosition(editX, editY, editButtons);
} else { } else {
m_editPopupMenu.hide(); if (m_editPopupMenu != null)
m_editPopupMenu.hide();
} }
} }