From ac9ead36e29baf63709c017e1f746817bd21aa39 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 10 Apr 2014 13:10:24 -0700 Subject: [PATCH] fix crash: don't access null action In particular, don't crash on pressing Enter when lacking qxmpp support --- interface/src/Menu.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 8eead4acdc..80007da485 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -707,7 +707,12 @@ bool Menu::isOptionChecked(const QString& menuOption) { } void Menu::triggerOption(const QString& menuOption) { - _actionHash.value(menuOption)->trigger(); + QAction* action = _actionHash.value(menuOption); + if (action) { + action->trigger(); + } else { + qDebug() << "NULL Action for menuOption '" << menuOption << "'"; + } } QAction* Menu::getActionForOption(const QString& menuOption) {