forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #185 - diff dialog shown twice on external modification

This commit is contained in:
Basile Burg 2017-08-21 06:28:44 +02:00
parent 462214cec3
commit 4733c1d5f8
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ce_synmemo.pas
View File

@ -236,6 +236,7 @@ type
fKnowsDscanner: boolean; fKnowsDscanner: boolean;
fDscannerEnabled: boolean; fDscannerEnabled: boolean;
fScrollPreview: boolean; fScrollPreview: boolean;
fDiffDialogWillClose: boolean;
procedure showHintEvent(Sender: TObject; HintInfo: PHintInfo); procedure showHintEvent(Sender: TObject; HintInfo: PHintInfo);
procedure setGutterTransparent(value: boolean); procedure setGutterTransparent(value: boolean);
procedure decCallTipsLvl; procedure decCallTipsLvl;
@ -2893,7 +2894,7 @@ var
str: TStringList; str: TStringList;
txt: string; txt: string;
begin begin
if fDisableFileDateCheck then if fDiffDialogWillClose or fDisableFileDateCheck then
exit; exit;
if fFilename.isNotEmpty and not fFilename.fileExists and if fFilename.isNotEmpty and not fFilename.fileExists and
(fFilename <> '<new document>') then (fFilename <> '<new document>') then
@ -2916,6 +2917,7 @@ begin
if not MDMatch(curMd5, newMd5) then if not MDMatch(curMd5, newMd5) then
begin begin
lines.SaveToFile(tempFilename); lines.SaveToFile(tempFilename);
fDiffDialogWillClose := true;
With TCEDiffViewer.construct(fTempFileName, fFilename) do With TCEDiffViewer.construct(fTempFileName, fFilename) do
try try
mr := ShowModal; mr := ShowModal;
@ -2930,6 +2932,7 @@ begin
end; end;
finally finally
free; free;
fDiffDialogWillClose := false;
end; end;
end; end;
finally finally