--- a/Menu.st	Mon Sep 16 12:17:07 2002 +0200
+++ b/Menu.st	Mon Sep 16 12:54:30 2002 +0200
@@ -300,10 +300,17 @@
 menuItems:aCollectionOfMenuItems menuItemGroups:sizes values:values
     |n|
 
+    items := groupSizes := nil.
+
+    aCollectionOfMenuItems size == 0 ifTrue:[ ^ self ].
+
     items := aCollectionOfMenuItems.
-    groupSizes := sizes.
+
     sizes size > 0 ifTrue:[
+        groupSizes := sizes.
+
         n := sizes inject:0 into:[:sumSoFar :this | sumSoFar + this].
+
         n = items size ifTrue:[
             groupSizes := sizes copyWithoutLast:1
         ]
@@ -579,11 +586,11 @@
 
     |items groups values|
 
-"/    ((aLiteralEncodedArray at:2) at:1) == #OrderedCollection ifTrue:[
-"/        items := (aLiteralEncodedArray at:2) decodeAsLiteralArray
-"/    ] ifFalse:[
-    items := (aLiteralEncodedArray at:2) collect:[:item | item decodeAsLiteralArray].
-"/    ].
+    items := aLiteralEncodedArray at:2.
+
+    items ifNotNil:[
+        items := items collect:[:item | item decodeAsLiteralArray].
+    ].
     groups := aLiteralEncodedArray at:3 ifAbsent:nil.
     values := aLiteralEncodedArray at:4 ifAbsent:nil.
     self menuItems:items menuItemGroups:groups values:values.
@@ -982,5 +989,5 @@
 !Menu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.52 2002-08-22 16:53:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.53 2002-09-16 10:54:30 ca Exp $'
 ! !