Fixed potential bug in destruction order. #20

Embarcadero · Dec 7, 2024 · 80424c8 · 80424c8
1 parent 5a4b442
commit 80424c8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Source/BoldElements.pas b/Source/BoldElements.pas
@@ -974,11 +974,16 @@ constructor TBoldExternalVariable.Create(AEvaluator: TBoldEvaluator; const AName
 end;
 
 destructor TBoldExternalVariable.Destroy;
+var
+  vEvaluator: TBoldEvaluator;
 begin
   fSubscriber.Free;
-  if Assigned(fEvaluator) then
-    fEvaluator.UndefineVariable(self);
-  fEvaluator := nil;
+  vEvaluator := fEvaluator;
+  if Assigned(vEvaluator) then
+  begin
+    fEvaluator := nil;
+    vEvaluator.UndefineVariable(self);
+  end;
   inherited;
 end;