From 702e08b083b952dee409b089eb02286727bfe6b6 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 4 Sep 2023 22:41:12 -0400 Subject: [PATCH] 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 --- eeschema/eeschema.cpp | 5 ++--- pcbnew/pcbnew.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index aa5ab55cd6..f786e80313 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -332,12 +332,11 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) // This is process-level-initialization, not project-level-initialization of the DSO. // Do nothing in here pertinent to a project! 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 // loaded prior to use to avoid threading deadlocks - aProgram->GetSettingsManager().RegisterSettings( new SYMBOL_EDITOR_SETTINGS, false ); - aProgram->GetSettingsManager().Load(); + aProgram->GetSettingsManager().RegisterSettings( new SYMBOL_EDITOR_SETTINGS ); start_common( aCtlBits ); diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index 11e54291c6..d7eacbf74e 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -348,15 +348,14 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) // This is process-level-initialization, not project-level-initialization of the DSO. // Do nothing in here pertinent to a project! 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 // loaded prior to use to avoid threading deadlocks - aProgram->GetSettingsManager().RegisterSettings( new FOOTPRINT_EDITOR_SETTINGS, false ); - aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS, false ); - aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS, false ); + aProgram->GetSettingsManager().RegisterSettings( new FOOTPRINT_EDITOR_SETTINGS ); + aProgram->GetSettingsManager().RegisterSettings( new CVPCB_SETTINGS ); + aProgram->GetSettingsManager().RegisterSettings( new EDA_3D_VIEWER_SETTINGS ); - aProgram->GetSettingsManager().Load(); start_common( aCtlBits ); if( !loadGlobalLibTable() )