From d6b13ef42c6a1f4627dacad65e92f1bec3771a0e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 28 Nov 2015 11:12:39 +1300 Subject: [PATCH] Fix crash when try to remove invalid menu item in JavaScript --- libraries/ui/src/VrMenu.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index 211e0e0f72..41cf27efb2 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -183,6 +183,10 @@ void VrMenu::insertAction(QAction* before, QAction* action) { } void VrMenu::removeAction(QAction* action) { + if (!action) { + qWarning("Attempted to remove invalid menu action"); + return; + } MenuUserData* userData = MenuUserData::forObject(action); if (!userData) { qWarning("Attempted to remove menu action with no found QML object");