Fixing a memory leak

OpenPonk · Oct 19, 2024 · 070ae5f · 070ae5f
1 parent 1307ac8
commit 070ae5f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/repository/OpenPonk-Core/SpAbstractPresenter.extension.st b/repository/OpenPonk-Core/SpAbstractPresenter.extension.st
@@ -0,0 +1,16 @@
+Extension { #name : 'SpAbstractPresenter' }
+
+{ #category : '*OpenPonk-Core' }
+SpAbstractPresenter >> whenWindowClosedDo: aBlock [
+
+	self withWindowEnsureDo: [ :window | window whenClosedDo: aBlock ]
+]
+
+{ #category : '*OpenPonk-Core' }
+SpAbstractPresenter >> withWindowEnsureDo: aBlock [
+
+	self hasWindow ifFalse: [
+		^ self whenBuiltDo: [ aBlock value: self root ] ].
+
+	aBlock value: self root
+]
diff --git a/repository/OpenPonk-Spec/OPDiagramsList.class.st b/repository/OpenPonk-Spec/OPDiagramsList.class.st
@@ -249,9 +249,8 @@ OPDiagramsList >> project [
 OPDiagramsList >> project: aProject [
 
 	project := aProject.
+	self whenWindowClosedDo: [ project unsubscribe: self ].
 	project whenChanged: [ self updateContent ].
-	self withWindowDo: [ :window |
-		window whenClosedDo: [ project unsubscribe: self ] ].
 	self updateContent.
 	self workbench announcer
 		when: OPEditorUnfocused

diff --git a/repository/OpenPonk-Spec/OPWorkbench.class.st b/repository/OpenPonk-Spec/OPWorkbench.class.st
@@ -279,14 +279,13 @@ OPWorkbench >> openProject: aProject [
 		project: project;
 		workbench: self.
 	topToolbar updateProjectMenu.
+	self whenWindowClosedDo: [ project unsubscribe: self ].
 	project whenChanged: [ self updateTitle ].
 	diagramsList project: project.
 	projectTree openOn: project.
 	projectController openDiagrams.
 	self hasWindow ifFalse: [ self open ].
-	self withWindowDo: [ :window | 
-		window whenClosedDo: [ project unsubscribe: self ] ].
-	self updateTitle.
+	self updateTitle
 ]
 
 { #category : 'opening' }