summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-24 01:38:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-25 15:07:14 +0300
commit233f2b564e7707f79deb493444f28363ac10bfd4 (patch)
treeee9d960c24e68f7ce9da05ee9a0333a74615565d /src/gui/widgets/tabs
parent1498a699f89f7b5aebdc4629c645c3702ee04f92 (diff)
downloadplus-233f2b564e7707f79deb493444f28363ac10bfd4.tar.gz
plus-233f2b564e7707f79deb493444f28363ac10bfd4.tar.bz2
plus-233f2b564e7707f79deb493444f28363ac10bfd4.tar.xz
plus-233f2b564e7707f79deb493444f28363ac10bfd4.zip
Add missing checks on nonnull attributes to widgets.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/setup_input.h2
-rw-r--r--src/gui/widgets/tabs/setuptabscroll.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index eb97dd644..ac8a06609 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -87,7 +87,7 @@ class Setup_Input final : public SetupTab
static void fixTranslation(SetupActionData *const actionDatas,
const InputActionT actionStart,
const InputActionT actionEnd,
- const std::string &text);
+ const std::string &text) A_NONNULL(1);
KeyListModel *mKeyListModel;
ListBox *mKeyList;
diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp
index 0a0294357..11c7afd61 100644
--- a/src/gui/widgets/tabs/setuptabscroll.cpp
+++ b/src/gui/widgets/tabs/setuptabscroll.cpp
@@ -70,6 +70,8 @@ void SetupTabScroll::clear()
void SetupTabScroll::addControl(SetupItem *const widget)
{
+ if (!widget)
+ return;
const std::string actionId = widget->getActionEventId();
if (!actionId.empty())
{