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

fix #333 - Case where symstring `<CPP>` is empty but should not

This commit is contained in:
Basile Burg 2018-06-16 07:21:23 +02:00
parent 1badb23169
commit 3944a2e0f2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ce_main.pas
View File

@ -3801,6 +3801,8 @@ begin
exit; exit;
fProjectGroup.closeGroup; fProjectGroup.closeGroup;
fProjectGroup.openGroup(TMenuItem(Sender).Hint); fProjectGroup.openGroup(TMenuItem(Sender).Hint);
if (fProject = nil) and (fProjectGroup.getProjectIndex < fProjectGroup.projectCount) then
fProjectGroup.getProject(fProjectGroup.getProjectIndex).activate();
end; end;
procedure TCEMainForm.actProjCloseExecute(Sender: TObject); procedure TCEMainForm.actProjCloseExecute(Sender: TObject);
@ -3970,6 +3972,8 @@ begin
finally finally
free; free;
end; end;
if (fProject = nil) and (fProjectGroup.getProjectIndex < fProjectGroup.projectCount) then
fProjectGroup.getProject(fProjectGroup.getProjectIndex).activate();
end; end;
procedure TCEMainForm.actProjSaveGroupAsExecute(Sender: TObject); procedure TCEMainForm.actProjSaveGroupAsExecute(Sender: TObject);

9
src/ce_symstring.pas
View File

@ -103,10 +103,10 @@ end;
procedure TCESymbolExpander.projClosing(project: ICECommonProject); procedure TCESymbolExpander.projClosing(project: ICECommonProject);
begin begin
fProjInterface := nil; if fProjInterface = project then
if fProj <> project.getProject then fProjInterface := nil;
exit; if fProj = project.getProject then
fProj := nil; fProj := nil;
fNeedUpdate := true; fNeedUpdate := true;
end; end;
@ -178,6 +178,7 @@ var
const const
na = '``'; na = '``';
begin begin
//commented : mini explorer doesn't emitt notif,
//if not fNeedUpdate then //if not fNeedUpdate then
// exit; // exit;
fNeedUpdate := false; fNeedUpdate := false;