fix, more missing warning on temp module close

This commit is contained in:
Basile Burg 2015-11-07 05:45:59 +01:00
parent 2190fb0d51
commit 84cf158b1a
2 changed files with 4 additions and 2 deletions

View File

@ -249,6 +249,7 @@ var
doc: TCESynMemo; doc: TCESynMemo;
begin begin
doc := getDocument(index); doc := getDocument(index);
if not assigned(doc) then exit(false);
if (doc.modified or (doc.fileName = doc.tempFilename)) and if (doc.modified or (doc.fileName = doc.tempFilename)) and
(dlgFileChangeClose(fDoc.fileName) = mrCancel) then exit(false); (dlgFileChangeClose(fDoc.fileName) = mrCancel) then exit(false);
doc.Free; doc.Free;
@ -261,7 +262,7 @@ end;
procedure TCEEditorWidget.pageCloseBtnClick(Sender: TObject); procedure TCEEditorWidget.pageCloseBtnClick(Sender: TObject);
begin begin
PageControl.PageIndex := TTabSheet(sender).PageIndex; PageControl.PageIndex := TTabSheet(sender).PageIndex;
if fDoc <> nil then fDoc.Free; closeDocument(PageControl.PageIndex);
end; end;
{$ENDIF} {$ENDIF}

View File

@ -1491,7 +1491,8 @@ end;
procedure TCEMainForm.actFileCloseExecute(Sender: TObject); procedure TCEMainForm.actFileCloseExecute(Sender: TObject);
begin begin
if fDoc = nil then exit; if fDoc = nil then exit;
if fDoc.modified and (dlgFileChangeClose(fDoc.fileName) = mrCancel) then exit; if (fDoc.modified or(fDoc.fileName = fDoc.tempFilename))
and (dlgFileChangeClose(fDoc.fileName) = mrCancel) then exit;
fDoc.Free; fDoc.Free;
end; end;