From 523738af8443b91dba07269c190cdf8ed3d2d775 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sat, 1 Nov 2008 09:02:29 +0000
Subject: [PATCH] Fix bug #840: Confirm != Confirm. Press Cancel: No confirm
 dialog Press X: Confirmation dialog if content was modified

---
 source/bineditor.pas  | 15 +++++++++------
 source/texteditor.pas | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/source/bineditor.pas b/source/bineditor.pas
index 5a578972..3a3ad8ad 100644
--- a/source/bineditor.pas
+++ b/source/bineditor.pas
@@ -152,6 +152,15 @@ end;
 
 
 procedure TfrmBinEditor.btnCancelClick(Sender: TObject);
+begin
+  if FStopping then
+    Exit;
+  FStopping := True;
+  TCustomVirtualStringTree(Owner).CancelEditNode;
+end;
+
+
+procedure TfrmBinEditor.FormClose(Sender: TObject; var Action: TCloseAction);
 var
   DoPost: Boolean;
 begin
@@ -169,12 +178,6 @@ begin
 end;
 
 
-procedure TfrmBinEditor.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-  btnCancelClick(Sender);
-end;
-
-
 procedure TfrmBinEditor.btnApplyClick(Sender: TObject);
 begin
   FStopping := True;
diff --git a/source/texteditor.pas b/source/texteditor.pas
index c1978d73..2d0a4a76 100644
--- a/source/texteditor.pas
+++ b/source/texteditor.pas
@@ -155,6 +155,15 @@ end;
 
 
 procedure TfrmTextEditor.btnCancelClick(Sender: TObject);
+begin
+  if FStopping then
+    Exit;
+  FStopping := True;
+  TCustomVirtualStringTree(Owner).CancelEditNode;
+end;
+
+
+procedure TfrmTextEditor.FormClose(Sender: TObject; var Action: TCloseAction);
 var
   DoPost: Boolean;
 begin
@@ -172,12 +181,6 @@ begin
 end;
 
 
-procedure TfrmTextEditor.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-  btnCancelClick(Sender);
-end;
-
-
 procedure TfrmTextEditor.btnApplyClick(Sender: TObject);
 begin
   FStopping := True;