From 07d2b0cf070f0b4368bc9bdd3554f4470b7060eb Mon Sep 17 00:00:00 2001 From: FreeSlave Date: Fri, 29 Apr 2016 08:38:37 -0400 Subject: [PATCH] Fix segfault when MenuItem does not have Action --- src/dlangui/widgets/menu.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlangui/widgets/menu.d b/src/dlangui/widgets/menu.d index 66ec96ac..eb9abb51 100644 --- a/src/dlangui/widgets/menu.d +++ b/src/dlangui/widgets/menu.d @@ -211,7 +211,7 @@ class MenuItem { } /// returns item label @property UIString label() { - return _action.labelValue; + return _action !is null ? _action.labelValue : UIString(""); } /// returns item action @property const(Action) action() const { return _action; } @@ -372,7 +372,7 @@ class MenuItemWidget : WidgetGroupDefaultDrawing { _item = item; styleId = STYLE_MENU_ITEM; updateState(); - string iconId = _item.action.iconId; + string iconId = _item.action !is null ? _item.action.iconId : ""; if (_item.type == MenuItemType.Check) iconId = "btn_check"; else if (_item.type == MenuItemType.Radio)