History

fix a couple shutdown crashes and a class of asan warning

Seth Alves committed 7 years ago

Commit 6589db61 parent 6cd57705 files · +39 −25Browse files

Showing the changes to interface/src/scripting/MenuScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

interface/src/scripting/MenuScriptingInterface.cpp+4−4
@@ -43,7 +43,7 @@ bool MenuScriptingInterface::menuExists(const QString& menu) { · 42 unmodified lines
43 if (QThread::currentThread() == qApp->thread()) {43 if (QThread::currentThread() == qApp->thread()) {
44 return Menu::getInstance()->menuExists(menu);44 return Menu::getInstance()->menuExists(menu);
45 }45 }
46 bool result;46 bool result { false };
47 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuExists",47 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuExists",
48 Q_RETURN_ARG(bool, result), 48 Q_RETURN_ARG(bool, result),
49 Q_ARG(const QString&, menu));49 Q_ARG(const QString&, menu));
@@ -86,7 +86,7 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& · 36 unmodified lines
86 if (QThread::currentThread() == qApp->thread()) {86 if (QThread::currentThread() == qApp->thread()) {
87 return Menu::getInstance()->menuItemExists(menu, menuitem);87 return Menu::getInstance()->menuItemExists(menu, menuitem);
88 }88 }
89 bool result;89 bool result { false };
90 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuItemExists",90 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuItemExists",
91 Q_RETURN_ARG(bool, result),91 Q_RETURN_ARG(bool, result),
92 Q_ARG(const QString&, menu),92 Q_ARG(const QString&, menu),
@@ -98,7 +98,7 @@ bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) { · 5 unmodified lines
98 if (QThread::currentThread() == qApp->thread()) {98 if (QThread::currentThread() == qApp->thread()) {
99 return Menu::getInstance()->isOptionChecked(menuOption);99 return Menu::getInstance()->isOptionChecked(menuOption);
100 }100 }
101 bool result;101 bool result { false };
102 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isOptionChecked",102 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isOptionChecked",
103 Q_RETURN_ARG(bool, result), 103 Q_RETURN_ARG(bool, result),
104 Q_ARG(const QString&, menuOption));104 Q_ARG(const QString&, menuOption));
@@ -115,7 +115,7 @@ bool MenuScriptingInterface::isMenuEnabled(const QString& menuOption) { · 10 unmodified lines
115 if (QThread::currentThread() == qApp->thread()) {115 if (QThread::currentThread() == qApp->thread()) {
116 return Menu::getInstance()->isOptionChecked(menuOption);116 return Menu::getInstance()->isOptionChecked(menuOption);
117 }117 }
118 bool result;118 bool result { false };
119 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isMenuEnabled",119 BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isMenuEnabled",
120 Q_RETURN_ARG(bool, result),120 Q_RETURN_ARG(bool, result),
121 Q_ARG(const QString&, menuOption));121 Q_ARG(const QString&, menuOption));