Fix passing wrong value to workspace close listener

Col-E · Jun 8, 2024 · 47ee102 · 47ee102
1 parent b76350c
commit 47ee102
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/recaf-core/src/main/java/software/coley/recaf/services/workspace/BasicWorkspaceManager.java b/recaf-core/src/main/java/software/coley/recaf/services/workspace/BasicWorkspaceManager.java
@@ -47,9 +47,10 @@ public Workspace getCurrent() {
 
 	@Override
 	public void setCurrentIgnoringConditions(Workspace workspace) {
-		if (current != null) {
-			current.close();
-			CollectionUtil.safeForEach(closeListeners, listener -> listener.onWorkspaceClosed(workspace),
+		Workspace currentWorkspace = current;
+		if (currentWorkspace != null) {
+			currentWorkspace.close();
+			CollectionUtil.safeForEach(closeListeners, listener -> listener.onWorkspaceClosed(currentWorkspace),
 					(listener, t) -> logger.error("Exception thrown when closing workspace", t));
 		}
 		current = workspace;