--- a/ControllerWithMenu.st	Mon Apr 18 18:25:54 2005 +0200
+++ b/ControllerWithMenu.st	Mon Apr 18 18:29:58 2005 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+"{ Package: 'stx:libview' }"
+
 Controller subclass:#ControllerWithMenu
 	instanceVariableNames:'menuHolder performer'
 	classVariableNames:''
@@ -74,10 +76,10 @@
     |m selection|
 
     (m := self menu) notNil ifTrue:[
-	selection := m startUp.
-	selection ~~ 0 ifTrue:[
-	    performer perform:selection
-	]
+        selection := m startUp.
+        (selection notNil and: [selection ~~ 0]) ifTrue:[
+            performer perform:selection
+        ]
     ]
 ! !
 
@@ -93,5 +95,5 @@
 !ControllerWithMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ControllerWithMenu.st,v 1.8 1997-11-15 13:39:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ControllerWithMenu.st,v 1.9 2005-04-18 16:29:58 cg Exp $'
 ! !