AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 13:10:13 +00:00
Files Issues Releases Activity

Fix a few more cases where migrated project files were being saved implicitly

Browse Source 
(cherry picked from commit a429afe4e9)
This commit is contained in:
Jon Evans 2025-02-04 18:37:13 -05:00
parent d91d07d187
commit 458df1ebab
1 changed files with 13 additions and 1 deletions

14
common/settings/settings_manager.cpp
View File

@ -155,6 +155,13 @@ void SETTINGS_MANAGER::Save()
if( dynamic_cast<COLOR_SETTINGS*>( settings.get() ) )
continue;
// Never automatically save project settings, caller should use SaveProject or UnloadProject
if( dynamic_cast<PROJECT_FILE*>( settings.get() )
|| dynamic_cast<PROJECT_LOCAL_SETTINGS*>( settings.get() ) )
{
continue;
}
settings->SaveToFile( GetPathForSettingsFile( settings.get() ) );
}
}
@ -1178,6 +1185,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )
PROJECT_FILE* file = m_project_files[name];
if( file->WasMigrated() )
aSave = false;
auto it = std::find_if( m_settings.begin(), m_settings.end(),
[&file]( const std::unique_ptr<JSON_SETTINGS>& aPtr )
{
@ -1188,7 +1198,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )
{
wxString projectPath = GetPathForSettingsFile( it->get() );
FlushAndRelease( &aProject->GetLocalSettings(), aSave );
bool saveLocalSettings = aSave && !aProject->GetLocalSettings().WasMigrated();
FlushAndRelease( &aProject->GetLocalSettings(), saveLocalSettings );
if( aSave )
( *it )->SaveToFile( projectPath );