From 7696ff89c9a9cc8f738e3134bfcab831ff314968 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Sun, 10 Jan 2016 13:29:23 +0200
Subject: 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>
---
 src/plugins/platforms/android/androidjnimenu.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins')

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());
-- 
cgit v1.2.3