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

Don't call .Load() and cause settings to reload from disk 

RegisterSettings can load the new settings json as added by not turning off the load now parameter
This commit is contained in:
Marek Roszko 2023-09-04 22:41:03 -04:00
parent d57b726c90
commit a2522a2230
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/eeschema.cpp
View File

@ -373,12 +373,11 @@ 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(), false ); 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, false ); aProgram->GetSettingsManager().RegisterSettings( new SYMBOL_EDITOR_SETTINGS );
aProgram->GetSettingsManager().Load();
start_common( aCtlBits ); start_common( aCtlBits );

9
pcbnew/pcbnew.cpp
View File

@ -382,15 +382,14 @@ 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( KifaceSettings(), false ); 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, false ); aProgram->GetSettingsManager().RegisterSettings( new FOOTPRINT_EDITOR_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS, false ); aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS );
aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS, false ); aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS );
aProgram->GetSettingsManager().Load();
start_common( aCtlBits ); start_common( aCtlBits );
if( !loadGlobalLibTable() ) if( !loadGlobalLibTable() )