Fixes #1547

pharo-spec · Sep 20, 2024 · 1369b5f · 1369b5f
1 parent 8e0e75a
commit 1369b5f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Spec2-Adapters-Morphic/SpWindow.class.st b/src/Spec2-Adapters-Morphic/SpWindow.class.st
@@ -42,14 +42,13 @@ SpWindow >> announceWillClose [
 { #category : 'open/close' }
 SpWindow >> close [ 
 
-	self announceWillClose ifFalse: [ ^ self ].
 	super close.
 ]
 
 { #category : 'open/close' }
 SpWindow >> deleteDiscardingChanges [
 
-	self announceWillClose.
+	self announceWillClose ifFalse: [ ^ self ].
 	^ super deleteDiscardingChanges
 ]
 
@@ -92,12 +91,13 @@ SpWindow >> taskbarTask [
 	"Answer a taskbar task for the receiver.
 	 Answer nil if not required."
 
-	(self valueOfProperty: #noTaskbarTask ifAbsent: [false]) ifTrue: [ ^ nil ].
+	(self valueOfProperty: #noTaskbarTask ifAbsent: [ false ]) ifTrue: [
+		^ nil ].
 
 	taskbarTask := TaskbarTask
 		morph: self
 		state: self taskbarState
-		icon: self model taskbarIcon
+		icon: (self model iconNamed: self model taskbarIconName)
 		label: self taskbarLabel.
 
 	^ taskbarTask