diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-01-10 13:29:23 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2016-02-04 16:04:33 +0000 |
| commit | 7696ff89c9a9cc8f738e3134bfcab831ff314968 (patch) | |
| tree | 6085f0bbcad29a69fcc5f1168613e32280e2cad0 /src/plugins/platforms/android | |
| parent | 69ab28031549ff1c9ceecdcb29197900e9bc4328 (diff) | |
Android: Fix crash, don't add null visible menus to pendingContextMenus
Regression introduced in e3689949ba5b23decb0ea85741a3f4829696788e
Change-Id: I9d3e37733d933e037f04d3a6efaf05607e16d9c5
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp index 6a373d7125..551931b688 100644 --- a/src/plugins/platforms/android/androidjnimenu.cpp +++ b/src/plugins/platforms/android/androidjnimenu.cpp @@ -93,7 +93,8 @@ namespace QtAndroidMenu void showContextMenu(QAndroidPlatformMenu *menu, const QRect &anchorRect, JNIEnv *env) { QMutexLocker lock(&visibleMenuMutex); - pendingContextMenus.append(visibleMenu); + if (visibleMenu) + pendingContextMenus.append(visibleMenu); visibleMenu = menu; menu->aboutToShow(); env->CallStaticVoidMethod(applicationClass(), openContextMenuMethodID, anchorRect.x(), anchorRect.y(), anchorRect.width(), anchorRect.height()); |