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

Flip the RegisterSettings order to avoid legacy import crashes 

(cherry picked from commit 32c2135047)
This commit is contained in:
Marek Roszko 2023-09-04 23:22:39 -04:00 committed by Mark Roszko
parent a2522a2230
commit b566f994bb
No known key found for this signature in database
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/eeschema.cpp
View File

@ -373,12 +373,16 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits )
// This is process-level-initialization, not project-level-initialization of the DSO. // This is process-level-initialization, not project-level-initialization of the DSO.
// Do nothing in here pertinent to a project! // Do nothing in here pertinent to a project!
InitSettings( new EESCHEMA_SETTINGS ); InitSettings( new EESCHEMA_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( KifaceSettings() );
// Register the symbol editor settings as well because they share a KiFACE and need to be // Register the symbol editor settings as well because they share a KiFACE and need to be
// loaded prior to use to avoid threading deadlocks // loaded prior to use to avoid threading deadlocks
aProgram->GetSettingsManager().RegisterSettings( new SYMBOL_EDITOR_SETTINGS ); aProgram->GetSettingsManager().RegisterSettings( new SYMBOL_EDITOR_SETTINGS );
// We intentionally register KifaceSettings after SYMBOL_EDITOR_SETTINGS
// In legacy configs, many settings were in a single editor config nd the migration routine
// for the main editor file will try and call into the now separate settings stores
// to move the settings into them
aProgram->GetSettingsManager().RegisterSettings( KifaceSettings() );
start_common( aCtlBits ); start_common( aCtlBits );
if( !loadGlobalLibTable() ) if( !loadGlobalLibTable() )

9
pcbnew/pcbnew.cpp
View File

@ -382,13 +382,18 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits )
// This is process-level-initialization, not project-level-initialization of the DSO. // This is process-level-initialization, not project-level-initialization of the DSO.
// Do nothing in here pertinent to a project! // Do nothing in here pertinent to a project!
InitSettings( new PCBNEW_SETTINGS ); InitSettings( new PCBNEW_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new FOOTPRINT_EDITOR_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS );
// We intentionally register KifaceSettings after FOOTPRINT_EDITOR_SETTINGS and EDA_3D_VIEWER_SETTINGS
// In legacy configs, many settings were in a single editor config and the migration routine
// for the main editor file will try and call into the now separate settings stores
// to move the settings into them
aProgram->GetSettingsManager().RegisterSettings( KifaceSettings() ); aProgram->GetSettingsManager().RegisterSettings( KifaceSettings() );
// Register the footprint editor settings as well because they share a KiFACE and need to be // Register the footprint editor settings as well because they share a KiFACE and need to be
// loaded prior to use to avoid threading deadlocks // loaded prior to use to avoid threading deadlocks
aProgram->GetSettingsManager().RegisterSettings( new FOOTPRINT_EDITOR_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS ); aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS );
start_common( aCtlBits ); start_common( aCtlBits );