From f847d364a84dc5fd9b4476f48ff091a0e5090c10 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 23 Oct 2019 11:48:19 -0700 Subject: [PATCH] DEV-2498: Fix a crash in MenuScriptingInterface --- interface/src/scripting/MenuScriptingInterface.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/interface/src/scripting/MenuScriptingInterface.cpp b/interface/src/scripting/MenuScriptingInterface.cpp index ae6a7c7d67..1020c12733 100644 --- a/interface/src/scripting/MenuScriptingInterface.cpp +++ b/interface/src/scripting/MenuScriptingInterface.cpp @@ -41,7 +41,8 @@ void MenuScriptingInterface::removeMenu(const QString& menu) { bool MenuScriptingInterface::menuExists(const QString& menu) { if (QThread::currentThread() == qApp->thread()) { - return Menu::getInstance()->menuExists(menu); + Menu* menuInstance = Menu::getInstance(); + return menuInstance && menuInstance->menuExists(menu); } bool result { false }; BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuExists", @@ -84,7 +85,8 @@ void MenuScriptingInterface::removeMenuItem(const QString& menu, const QString& bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& menuitem) { if (QThread::currentThread() == qApp->thread()) { - return Menu::getInstance()->menuItemExists(menu, menuitem); + Menu* menuInstance = Menu::getInstance(); + return menuInstance && menuInstance->menuItemExists(menu, menuitem); } bool result { false }; BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuItemExists", @@ -96,7 +98,8 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) { if (QThread::currentThread() == qApp->thread()) { - return Menu::getInstance()->isOptionChecked(menuOption); + Menu* menuInstance = Menu::getInstance(); + return menuInstance && menuInstance->isOptionChecked(menuOption); } bool result { false }; BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isOptionChecked", @@ -113,7 +116,8 @@ void MenuScriptingInterface::setIsOptionChecked(const QString& menuOption, bool bool MenuScriptingInterface::isMenuEnabled(const QString& menuOption) { if (QThread::currentThread() == qApp->thread()) { - return Menu::getInstance()->isOptionChecked(menuOption); + Menu* menuInstance = Menu::getInstance(); + return menuInstance && menuInstance->isMenuEnabled(menuOption); } bool result { false }; BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isMenuEnabled",