haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading of auxiliary projects 

Projects list wasn't being used properly to track active Prj

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8998
This commit is contained in:
Jon Evans 2021-08-19 20:50:41 -04:00
parent 7d8f51dc2e
commit 781fb0ad0d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/settings/settings_manager.cpp
View File

@ -779,6 +779,15 @@ bool SETTINGS_MANAGER::LoadProject( const wxString& aFullPath, bool aSetActive )
PROJECT* oldProject = m_projects.begin()->second; PROJECT* oldProject = m_projects.begin()->second;
unloadProjectFile( oldProject, false ); unloadProjectFile( oldProject, false );
m_projects.erase( m_projects.begin() ); m_projects.erase( m_projects.begin() );
auto it = std::find_if( m_projects_list.begin(), m_projects_list.end(),
[&]( const std::unique_ptr<PROJECT>& ptr )
{
return ptr.get() == oldProject;
} );
wxASSERT( it != m_projects_list.end() );
m_projects_list.erase( it );
} }
wxLogTrace( traceSettings, "Load project %s", fullPath ); wxLogTrace( traceSettings, "Load project %s", fullPath );
@ -859,8 +868,8 @@ bool SETTINGS_MANAGER::UnloadProject( PROJECT* aProject, bool aSave )
PROJECT& SETTINGS_MANAGER::Prj() const PROJECT& SETTINGS_MANAGER::Prj() const
{ {
// No MDI yet: First project in the list is the active project // No MDI yet: First project in the list is the active project
wxASSERT_MSG( m_projects.size(), "no project in list" ); wxASSERT_MSG( m_projects_list.size(), "no project in list" );
return *m_projects.begin()->second; return *m_projects_list.begin()->get();
} }