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

Do not mess with KIPRJMOD when loading aux projects 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16810
This commit is contained in:
Jon Evans 2024-02-08 18:28:20 -05:00
parent ca6b40ef1c
commit febe759e49
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/project.cpp
View File

@ -122,14 +122,6 @@ void PROJECT::setProjectFullName( const wxString& aFullPathAndName )
wxASSERT( m_project_name.IsAbsolute() ); wxASSERT( m_project_name.IsAbsolute() );
wxASSERT( m_project_name.GetExt() == FILEEXT::ProjectFileExtension ); wxASSERT( m_project_name.GetExt() == FILEEXT::ProjectFileExtension );
// until multiple projects are in play, set an environment variable for the
// the project pointer.
{
wxString path = m_project_name.GetPath();
wxSetEnv( PROJECT_VAR_NAME, path );
}
} }
} }

35
common/settings/settings_manager.cpp
View File

@ -904,13 +904,21 @@ bool SETTINGS_MANAGER::LoadProject( const wxString& aFullPath, bool aSetActive )
std::unique_ptr<PROJECT> project = std::make_unique<PROJECT>(); std::unique_ptr<PROJECT> project = std::make_unique<PROJECT>();
project->setProjectFullName( fullPath ); project->setProjectFullName( fullPath );
if( aSetActive )
{
// until multiple projects are in play, set an environment variable for the
// the project pointer.
wxFileName projectPath( fullPath );
wxSetEnv( PROJECT_VAR_NAME, projectPath.GetPath() );
}
bool success = loadProjectFile( *project ); bool success = loadProjectFile( *project );
if( success ) if( success )
{ {
project->SetReadOnly( readOnly || project->GetProjectFile().IsReadOnly() ); project->SetReadOnly( readOnly || project->GetProjectFile().IsReadOnly() );
if( lockFile ) if( lockFile && aSetActive )
m_project_lock.reset( new LOCKFILE( std::move( lockFile ) ) ); m_project_lock.reset( new LOCKFILE( std::move( lockFile ) ) );
} }
@ -947,6 +955,8 @@ bool SETTINGS_MANAGER::UnloadProject( PROJECT* aProject, bool aSave )
wxLogTrace( traceSettings, wxT( "Unload project %s" ), projectPath ); wxLogTrace( traceSettings, wxT( "Unload project %s" ), projectPath );
PROJECT* toRemove = m_projects.at( projectPath ); PROJECT* toRemove = m_projects.at( projectPath );
bool wasActiveProject = m_projects_list.begin()->get() == toRemove;
auto it = std::find_if( m_projects_list.begin(), m_projects_list.end(), auto it = std::find_if( m_projects_list.begin(), m_projects_list.end(),
[&]( const std::unique_ptr<PROJECT>& ptr ) [&]( const std::unique_ptr<PROJECT>& ptr )
{ {
@ -958,19 +968,22 @@ bool SETTINGS_MANAGER::UnloadProject( PROJECT* aProject, bool aSave )
m_projects.erase( projectPath ); m_projects.erase( projectPath );
// Immediately reload a null project; this is required until the rest of the application if( wasActiveProject )
// is refactored to not assume that Prj() always works {
if( m_projects.empty() ) // Immediately reload a null project; this is required until the rest of the application
LoadProject( "" ); // is refactored to not assume that Prj() always works
if( m_projects_list.empty() )
LoadProject( "" );
// Remove the reference in the environment to the previous project // Remove the reference in the environment to the previous project
wxSetEnv( PROJECT_VAR_NAME, wxS( "" ) ); wxSetEnv( PROJECT_VAR_NAME, wxS( "" ) );
// Release lock on the file, in case we had one // Release lock on the file, in case we had one
m_project_lock = nullptr; m_project_lock = nullptr;
if( m_kiway ) if( m_kiway )
m_kiway->ProjectChanged(); m_kiway->ProjectChanged();
}
return true; return true;
} }