From 3944a2e0f2b842aa0f53c90d25973fe42ffb405a Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sat, 16 Jun 2018 07:21:23 +0200 Subject: [PATCH] fix #333 - Case where symstring `` is empty but should not --- src/ce_main.pas | 4 ++++ src/ce_symstring.pas | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ce_main.pas b/src/ce_main.pas index dfd72dc9..746f427f 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -3801,6 +3801,8 @@ begin exit; fProjectGroup.closeGroup; fProjectGroup.openGroup(TMenuItem(Sender).Hint); + if (fProject = nil) and (fProjectGroup.getProjectIndex < fProjectGroup.projectCount) then + fProjectGroup.getProject(fProjectGroup.getProjectIndex).activate(); end; procedure TCEMainForm.actProjCloseExecute(Sender: TObject); @@ -3970,6 +3972,8 @@ begin finally free; end; + if (fProject = nil) and (fProjectGroup.getProjectIndex < fProjectGroup.projectCount) then + fProjectGroup.getProject(fProjectGroup.getProjectIndex).activate(); end; procedure TCEMainForm.actProjSaveGroupAsExecute(Sender: TObject); diff --git a/src/ce_symstring.pas b/src/ce_symstring.pas index ea13d341..58c00af3 100644 --- a/src/ce_symstring.pas +++ b/src/ce_symstring.pas @@ -103,10 +103,10 @@ end; procedure TCESymbolExpander.projClosing(project: ICECommonProject); begin - fProjInterface := nil; - if fProj <> project.getProject then - exit; - fProj := nil; + if fProjInterface = project then + fProjInterface := nil; + if fProj = project.getProject then + fProj := nil; fNeedUpdate := true; end; @@ -178,6 +178,7 @@ var const na = '``'; begin + //commented : mini explorer doesn't emitt notif, //if not fNeedUpdate then // exit; fNeedUpdate := false;