From 64bdb4a87aa15420d9f6703949d5332ff353b3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Chi=C8=99?= <chisvasileandrei@gmail.com>
Date: Tue, 20 Aug 2024 16:42:20 +0200
Subject: [PATCH] Pass an evaluation result when resuming from the debugger
 [feenkcom/gtoolkit#3942]

---
 src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st b/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st
index 7fb011c4..3e191d1d 100644
--- a/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st
+++ b/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st
@@ -155,7 +155,8 @@ GtRsrEvaluatorPromise >> signalGemStoneDebugger [
 	exception signal.
 	
 	^ exception hasDebugResult
-		ifTrue: [ exception debugResult ]
+		ifTrue: [ GtGemstoneEvaluationWithComputedResult new
+			computedResult: exception debugResult ]
 		ifFalse: [ evaluationResult ]
 ]
 
@@ -191,12 +192,12 @@ GtRsrEvaluatorPromise >> wait [
 	self isGtEvaluationException ifTrue: [ 
 		evaluationResult := self signalGemStoneDebugger ].
 
+	gtSession ifNotNil: [ 
+		evaluationResult gtPharoProxyInitializeWithSession: gtSession ].
 	computedResult :=  serializationStrategy
 		ifNil: [ evaluationResult computedResult ]
 		ifNotNil: [ 
 			self deserializeResult: evaluationResult computedResult ].
-	gtSession ifNotNil: [ 
-		computedResult gtPharoProxyInitializeWithSession: gtSession ].
 	
 	autoCommit ifTrue: [ 
 		gtSession autoCommitPromise: self ].