--- a/Font.st	Fri Mar 06 16:09:09 2009 +0100
+++ b/Font.st	Tue Mar 17 17:01:08 2009 +0100
@@ -351,10 +351,8 @@
     "if I am already assigned to that device ..."
     (device == aDevice) ifTrue:[^ self].
 
-    aDevice isNil ifTrue:[
-        device notNil ifTrue:[
-            ^ self
-        ]
+    (aDevice isNil and:[device notNil]) ifTrue:[
+        ^ self
     ].
 
     aDevice deviceFonts do:[:aFont |
@@ -1207,7 +1205,7 @@
 !Font class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.112 2009-02-19 09:52:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Font.st,v 1.113 2009-03-17 16:01:08 stefan Exp $'
 ! !
 
 Font initialize!