--- a/ImageEditor.st	Tue May 31 12:41:51 2005 +0200
+++ b/ImageEditor.st	Thu Jun 02 14:29:58 2005 +0200
@@ -3057,20 +3057,20 @@
 updateLabelsAndHistory
     "updates labels and history, if something has changed"
 
-    self imageIsLoaded value: self image notNil.
-
-    self image isNil ifTrue: [^nil].
+    |image|
+
+    image := self image.
+
+    self imageIsLoaded value: image notNil.
+    image isNil ifTrue: [^nil].
 
     self updateInfoLabel.
 
     imageEditView resourceMessage asCollectionOfWords size = 2
         ifTrue: [self addToHistory: imageEditView resourceMessage -> #loadFromMessage:].
 
-    self image fileName notNil
-        ifTrue: [self addToHistory: self image fileName -> #loadFromFile:].
-
-
-
+    image fileName notNil
+        ifTrue: [self addToHistory: image fileName -> #loadFromFile:].
 !
 
 updateListOfColorsAndColormapMode