From 233f2b564e7707f79deb493444f28363ac10bfd4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 24 Jun 2015 01:38:17 +0300 Subject: Add missing checks on nonnull attributes to widgets. --- src/gui/widgets/tabs/setup_input.h | 2 +- src/gui/widgets/tabs/setuptabscroll.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/widgets/tabs') 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()) { -- cgit v1.2.3-70-g09d2