Merge pull request #1556 from demarey/Pharo13

sync PR #1555
pharo-spec · Jun 13, 2024 · b096eb5 · b096eb5
2 parents 545c7a8 + 92ccb51
commit b096eb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Spec2-Core/SpAbstractPresenter.class.st b/src/Spec2-Core/SpAbstractPresenter.class.st
@@ -548,7 +548,7 @@ SpAbstractPresenter >> withAdapterDo: aValuable [
 { #category : 'private - utilities' }
 SpAbstractPresenter >> withWindowDo: aValuable [
 
-	self hasWindow ifFalse: [ ^ self ].
+	self hasWindow ifFalse: [ ^ nil ].
 	"Since Presenter has window, root = window"
-	aValuable value: self root
+	^ aValuable value: self root
 ]
diff --git a/src/Spec2-Core/SpDialogWindowPresenter.class.st b/src/Spec2-Core/SpDialogWindowPresenter.class.st
@@ -270,6 +270,6 @@ SpDialogWindowPresenter >> triggerOkAction [
 	"Trigger defined ok action. 
 	 See `SpDialogWindowPresenter>>#okAction:`"
 
-	okAction ifNil: [ ^ self ].
-	okAction cull: self
+	okAction ifNil: [ ^ nil ].
+	^ okAction cull: self
 ]