Merge pull request from daleglass/fix_invoke_method_crash

Don't bind action if QML menu can't be added.
This commit is contained in:
Marcus Llewellyn 2019-12-30 18:23:08 -06:00 committed by GitHub
commit 3bb8498067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -269,7 +269,11 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
Q_ASSERT(invokeResult);
QObject* result = reinterpret_cast<QObject*>(returnedValue); // returnedValue.value<QObject*>();
Q_ASSERT(result);
bindActionToQmlAction(result, action, _rootMenu);
if ( result ) {
bindActionToQmlAction(result, action, _rootMenu);
} else {
qWarning() << "Failed to find addItem() method in object " << menu << ". Not inserting action " << action;
}
}
class QQuickMenuBase;