paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 21:59:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed aborting new project

Browse Source 
git-svn-id: trunk@5878 -
This commit is contained in:
mattias 2004-08-29 08:54:39 +00:00
parent 87eeaf72b3
commit c76d013e4e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ide/main.pp
View File

@ -1118,7 +1118,7 @@ begin
// check project // check project
if SomethingOfProjectIsModified then begin if SomethingOfProjectIsModified then begin
MsgResult:=MessageDlg(lisProjectChanged, Format(lisSaveChangesToProject, MsgResult:=MessageDlg(lisProjectChanged, Format(lisSaveChangesToProject,
[Project1.Title]), mtConfirmation, [mbYes, mbNo, mbCancel], 0); [Project1.Title]), mtConfirmation, [mbYes, mbNo, mbAbort], 0);
case MsgResult of case MsgResult of
mrYes: mrYes:
@ -1127,7 +1127,7 @@ begin
if not CanClose then exit; if not CanClose then exit;
end; end;
mrCancel: mrCancel, mrAbort:
begin begin
CanClose:= false; CanClose:= false;
Exit; Exit;
@ -5221,19 +5221,17 @@ Begin
// close current project first // close current project first
If Project1<>nil then begin If Project1<>nil then begin
if SomethingOfProjectIsModified then begin if SomethingOfProjectIsModified then begin
if MessageDlg(lisProjectChanged, Format(lisSaveChangesToProject, Result:=MessageDlg(lisProjectChanged, Format(lisSaveChangesToProject,
[Project1.Title]), [Project1.Title]),
mtconfirmation, [mbYes, mbNo, mbCancel], 0) = mrYes then begin mtconfirmation, [mbYes, mbNo, mbAbort], 0);
if DoSaveProject([])=mrAbort then begin if Result=mrYes then begin
Result:=mrAbort; Result:=DoSaveProject([]);
exit; if Result=mrAbort then exit;
end; end else if Result in [mrCancel,mrAbort] then
end; exit;
end;
if DoCloseProject=mrAbort then begin
Result:=mrAbort;
exit;
end; end;
Result:=DoCloseProject;
if Result=mrAbort then exit;
end; end;
// create a virtual project (i.e. unsaved and without real project directory) // create a virtual project (i.e. unsaved and without real project directory)
@ -10609,6 +10607,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.761 2004/08/29 08:54:39 mattias
fixed aborting new project
Revision 1.760 2004/08/26 21:32:31 vincents Revision 1.760 2004/08/26 21:32:31 vincents
Prepare lazarus for use with loader. Use -dUseStartLazarus to activate. Prepare lazarus for use with loader. Use -dUseStartLazarus to activate.