--- a/ApplicationModel.st	Wed Jul 13 15:15:21 2011 +0200
+++ b/ApplicationModel.st	Mon Jul 18 09:35:38 2011 +0200
@@ -405,7 +405,13 @@
     "/ this code is so ugly...
     "/ translate the specs name, if the display device type is different
     "/ for example, if the type is pda, the xxxSpec_pda spec will be used.
-    displayDevice := deviceOrNil ? Screen current ? Screen default.
+    displayDevice := deviceOrNil.
+    displayDevice isNil ifTrue:[
+        displayDevice := Screen current.
+        displayDevice isNil ifTrue:[
+            displayDevice := Screen default.
+        ]
+    ].
     displayDevice notNil ifTrue:[
         displayDeviceType := displayDevice deviceType.
         displayDeviceType notNil ifTrue:[
@@ -436,6 +442,8 @@
     ].
 
     ^ app perform:aKey
+
+    "Modified: / 18-07-2011 / 09:28:15 / cg"
 !
 
 subApplicationFor:aKey
@@ -3847,7 +3855,7 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.317 2011-07-11 22:08:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.318 2011-07-18 07:35:38 cg Exp $'
 ! !
 
 ApplicationModel initialize!