--- a/Button.st	Wed May 08 03:22:16 2019 +0200
+++ b/Button.st	Sat May 11 12:15:03 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -1252,9 +1250,13 @@
      (logo) in both pressed and released states."
 
     activeLogo := anImageOrString.
-    controller pressed ifTrue:[
-        self label:anImageOrString
+    controller notNil ifTrue:[
+        controller pressed ifTrue:[
+            self label:anImageOrString
+        ]
     ]
+
+    "Modified: / 11-05-2019 / 10:58:06 / Claus Gittinger"
 !
 
 allViewBackground:something if:condition
@@ -1419,10 +1421,14 @@
 
     enteredLogo := anImageOrString.
     labelChannel isNil ifTrue:[
-        controller entered ifTrue:[
-            self label:anImageOrString
+        controller notNil ifTrue:[
+            controller entered ifTrue:[
+                self label:anImageOrString
+            ]
         ]
     ]
+
+    "Modified: / 11-05-2019 / 10:57:48 / Claus Gittinger"
 !
 
 focusLogo:anImageOrString
@@ -1551,10 +1557,14 @@
 
     passiveLogo := anImageOrString.
     labelChannel isNil ifTrue:[
-        controller pressed ifFalse:[
-            self label:anImageOrString
+        controller notNil ifTrue:[
+            controller pressed ifFalse:[
+                self label:anImageOrString
+            ]
         ]
     ]
+
+    "Modified: / 11-05-2019 / 10:58:20 / Claus Gittinger"
 !
 
 takeDefault