From 82e9cbc4cc71bd48ebc074d7a9b9fc487baa5acb Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Fri, 27 Apr 2018 07:46:37 +0200
Subject: [PATCH] fix #302 - Message that warns about changes after reloading
 from diff dialog is confusing

---
 src/ce_diff.lfm    | 6 +++---
 src/ce_synmemo.pas | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ce_diff.lfm b/src/ce_diff.lfm
index 261af482..6356f3c8 100644
--- a/src/ce_diff.lfm
+++ b/src/ce_diff.lfm
@@ -6,7 +6,7 @@ object CEDiffViewer: TCEDiffViewer
   Caption = 'External file modification'
   ClientHeight = 441
   ClientWidth = 516
-  LCLVersion = '1.8.0.6'
+  Visible = False
   inline editor: TSynEdit
     Left = 4
     Height = 385
@@ -139,7 +139,7 @@ object CEDiffViewer: TCEDiffViewer
       TabOrder = 0
     end
     object btnAccept: TBitBtn
-      Left = 283
+      Left = 380
       Height = 29
       Hint = 'Load the new version'
       Top = 2
@@ -155,7 +155,7 @@ object CEDiffViewer: TCEDiffViewer
       TabOrder = 1
     end
     object btnCancel: TBitBtn
-      Left = 412
+      Left = 283
       Height = 29
       Hint = 'Don''t reload the modifications for now'
       Top = 2
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 31c60359..78f777cb 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -3236,6 +3236,7 @@ var
   curMd5: TMDDigest;
   str: TStringList;
   txt: string;
+  i: integer;
 begin
   if fDiffDialogWillClose or fDisableFileDateCheck then
     exit;
@@ -3268,6 +3269,7 @@ begin
             mrOK:
             begin
               replaceUndoableContent(str.strictText);
+              fModified := false;
               fFileDate := newDate;
             end;
             mrIgnore: fFileDate := newDate;