From 502701a32bf00a071106df9867940e25383efeb6 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Tue, 18 Aug 2009 23:08:20 +0000 Subject: [PATCH] Bugfix. When a menu is popped up but contains no items, the listData is null (rather than empty). Special! git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@850 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../com/threerings/flex/menuClasses/CommandMenuItemRenderer.as | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as b/src/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as index 831ec544..3b68819c 100644 --- a/src/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as +++ b/src/as/com/threerings/flex/menuClasses/CommandMenuItemRenderer.as @@ -38,6 +38,7 @@ public class CommandMenuItemRenderer extends MenuItemRenderer override protected function commitProperties () :void { super.commitProperties(); + // Note: a menu with no items will have a null listData if ((icon == null) && (listData is CommandListData)) { icon = CommandListData(listData).iconObject; @@ -46,7 +47,7 @@ public class CommandMenuItemRenderer extends MenuItemRenderer } } - if (label.visible) { + if (label.visible && (listData != null)) { var dataDescriptor :IMenuDataDescriptor = Menu(listData.owner).dataDescriptor; var typeVal :String = dataDescriptor.getType(data); if (typeVal == "title") {