Read hotkeys from disk after they change.

(Otherwise we'll write the old versions back out
when closing one app.)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19612

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -634,12 +634,12 @@ void EDA_3D_VIEWER_FRAME::SaveSettings( APP_SETTINGS_BASE *aCfg )
 }
 
 
-void EDA_3D_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void EDA_3D_VIEWER_FRAME::CommonSettingsChanged( int aFlags )
 {
     wxLogTrace( m_logTrace, wxT( "EDA_3D_VIEWER_FRAME::CommonSettingsChanged" ) );
 
     // Regen menu bars, etc
-    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     // There is no base class that handles toolbars for this frame
     ReCreateMainToolbar();

3d-viewer/3d_viewer/eda_3d_viewer_frame.h

@@ -114,7 +114,7 @@ public:
      * This would be private (and only called by the Kiway), but we need to do this manually
      * from the PCB frame because the 3D viewer isn't updated via the #KIWAY.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
     void ShowChangedLanguage() override;
 
     APPEARANCE_CONTROLS_3D* GetAppearanceManager() { return m_appearancePanel; }

common/eda_base_frame.cpp

@@ -555,9 +555,9 @@ void EDA_BASE_FRAME::ShowChangedLanguage()
 }
 
 
-void EDA_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void EDA_BASE_FRAME::CommonSettingsChanged( int aFlags )
 {
-    TOOLS_HOLDER::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    TOOLS_HOLDER::CommonSettingsChanged( aFlags );
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 
@@ -791,7 +791,7 @@ void EDA_BASE_FRAME::LoadWindowSettings( const WINDOW_SETTINGS* aCfg )
     m_perspective = aCfg->perspective;
     m_mruPath = aCfg->mru_path;
 
-    TOOLS_HOLDER::CommonSettingsChanged( false, false );
+    TOOLS_HOLDER::CommonSettingsChanged();
 }
 
 
@@ -1288,7 +1288,7 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
         // Update our grids that are cached in the tool
         m_toolManager->ResetTools( TOOL_BASE::REDRAW );
         Pgm().GetSettingsManager().Save();
-        dlg.Kiway().CommonSettingsChanged( false, false );
+        dlg.Kiway().CommonSettingsChanged( HOTKEYS_CHANGED );
     }
 
 }

common/eda_draw_frame.cpp

@@ -293,9 +293,9 @@ void EDA_DRAW_FRAME::ToggleUserUnits()
 }
 
 
-void EDA_DRAW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void EDA_DRAW_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     COMMON_SETTINGS*      settings = Pgm().GetCommonSettings();
     KIGFX::VIEW_CONTROLS* viewControls = GetCanvas()->GetViewControls();

common/kiway.cpp

@@ -614,7 +614,7 @@ void KIWAY::SetLanguage( int aLanguage )
 }
 
 
-void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void KIWAY::CommonSettingsChanged( int aFlags )
 {
     if( m_ctl & KFCTL_CPP_PROJECT_SUITE )
     {
@@ -624,7 +624,7 @@ void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
         EDA_BASE_FRAME* top = static_cast<EDA_BASE_FRAME*>( m_top );
 
         if( top )
-            top->CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+            top->CommonSettingsChanged( aFlags );
     }
 
     for( unsigned i=0;  i < KIWAY_PLAYER_COUNT;  ++i )
@@ -632,7 +632,7 @@ void KIWAY::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
         KIWAY_PLAYER* frame = GetPlayerFrame( ( FRAME_T )i );
 
         if( frame )
-            frame->CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+            frame->CommonSettingsChanged( aFlags );
     }
 }
 

common/tool/action_manager.cpp

@@ -282,14 +282,14 @@ int ACTION_MANAGER::GetHotKey( const TOOL_ACTION& aAction ) const
 
 void ACTION_MANAGER::UpdateHotKeys( bool aFullUpdate )
 {
-    static std::map<std::string, int> legacyHotKeyMap;
+    static std::map<std::string, int>                 legacyHotKeyMap;
     static std::map<std::string, std::pair<int, int>> userHotKeyMap;
-    static bool                       mapsInitialized = false;
+    static bool                                       mapsInitialized = false;
 
     m_actionHotKeys.clear();
     m_hotkeys.clear();
 
-    if( aFullUpdate && !mapsInitialized && m_toolMgr->GetToolHolder() )
+    if( m_toolMgr->GetToolHolder() && ( aFullUpdate || !mapsInitialized ) )
     {
         ReadLegacyHotkeyConfig( m_toolMgr->GetToolHolder()->ConfigBaseName(), legacyHotKeyMap );
         ReadHotKeyConfig( wxEmptyString, userHotKeyMap );

common/tool/common_control.cpp

@@ -95,7 +95,7 @@ int COMMON_CONTROL::ConfigurePaths( const TOOL_EVENT& aEvent )
         DIALOG_CONFIGURE_PATHS dlg( m_frame );
 
         if( dlg.ShowModal() == wxID_OK )
-            m_frame->Kiway().CommonSettingsChanged( true, false );
+            m_frame->Kiway().CommonSettingsChanged( ENVVARS_CHANGED );
     }
 
     return 0;

common/tool/tools_holder.cpp

@@ -150,10 +150,10 @@ void TOOLS_HOLDER::ShowChangedLanguage()
 }
 
 
-void TOOLS_HOLDER::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void TOOLS_HOLDER::CommonSettingsChanged( int aFlags )
 {
     if( GetToolManager() )
-        GetToolManager()->GetActionManager()->UpdateHotKeys( false );
+        GetToolManager()->GetActionManager()->UpdateHotKeys( aFlags & HOTKEYS_CHANGED );
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 

eeschema/eeschema_config.cpp

@@ -141,7 +141,7 @@ void SCH_EDIT_FRAME::ShowSchematicSetupDialog( const wxString& aInitialPage )
         // Mark document as modified so that project settings can be saved as part of doc save
         OnModify();
 
-        Kiway().CommonSettingsChanged( false, true );
+        Kiway().CommonSettingsChanged( TEXTVARS_CHANGED );
 
         Prj().IncrementTextVarsTicker();
         Prj().IncrementNetclassesTicker();

eeschema/sch_base_frame.cpp

@@ -513,9 +513,9 @@ COLOR4D SCH_BASE_FRAME::GetLayerColor( SCH_LAYER_ID aLayer )
 }
 
 
-void SCH_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void SCH_BASE_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aFlags );
 
     COLOR_SETTINGS* colorSettings = GetColorSettings( true );
 

eeschema/sch_base_frame.h

@@ -234,7 +234,7 @@ public:
      */
     void SyncView();
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     /**
      * Helper to retrieve a layer color from the global color settings

eeschema/sch_edit_frame.cpp

@@ -2132,9 +2132,9 @@ std::unique_ptr<GRID_HELPER> SCH_EDIT_FRAME::MakeGridHelper()
 }
 
 
-void SCH_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void SCH_EDIT_FRAME::CommonSettingsChanged( int aFlags )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     SCHEMATIC_SETTINGS& settings = Schematic().Settings();
 

eeschema/sch_edit_frame.h

@@ -829,7 +829,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     void UpdateNetHighlightStatus();
 

eeschema/sim/simulator_frame.cpp

@@ -276,9 +276,9 @@ void SIMULATOR_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
 }
 
 
-void SIMULATOR_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void SIMULATOR_FRAME::CommonSettingsChanged( int aFlags )
 {
-    KIWAY_PLAYER::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    KIWAY_PLAYER::CommonSettingsChanged( aFlags );
 
     auto* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( m_toolManager->GetSettings() );
     wxASSERT( cfg != nullptr );

eeschema/sim/simulator_frame.h

@@ -162,7 +162,7 @@ public:
 
     void SaveSettings( APP_SETTINGS_BASE* aCfg ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     WINDOW_SETTINGS* GetWindowSettings( APP_SETTINGS_BASE* aCfg ) override;
 

eeschema/symbol_diff_frame.h

@@ -68,7 +68,7 @@ public:
 
     WINDOW_SETTINGS* GetWindowSettings( APP_SETTINGS_BASE* aCfg ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     const BOX2I GetDocumentExtents( bool aIncludeAllVisible = true ) const override;
 

eeschema/symbol_editor/symbol_edit_frame.cpp

@@ -1336,9 +1336,9 @@ void SYMBOL_EDIT_FRAME::emptyScreen()
 }
 
 
-void SYMBOL_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void SYMBOL_EDIT_FRAME::CommonSettingsChanged( int aFlags )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     SETTINGS_MANAGER*       mgr = GetSettingsManager();
     SYMBOL_EDITOR_SETTINGS* cfg = mgr->GetAppSettings<SYMBOL_EDITOR_SETTINGS>( "symbol_editor" );
@@ -1360,7 +1360,7 @@ void SYMBOL_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextV
 
     RecreateToolbars();
 
-    if( aEnvVarsChanged )
+    if( aFlags & ENVVARS_CHANGED )
         SyncLibraries( true );
 
     Layout();

eeschema/symbol_editor/symbol_edit_frame.h

@@ -361,7 +361,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     void ShowChangedLanguage() override;
 

eeschema/symbol_viewer_frame.cpp

@@ -901,9 +901,9 @@ WINDOW_SETTINGS* SYMBOL_VIEWER_FRAME::GetWindowSettings( APP_SETTINGS_BASE* aCfg
 }
 
 
-void SYMBOL_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void SYMBOL_VIEWER_FRAME::CommonSettingsChanged( int aFlags )
 {
-    SCH_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    SCH_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     SETTINGS_MANAGER&  mgr = Pgm().GetSettingsManager();
     EESCHEMA_SETTINGS* cfg = mgr.GetAppSettings<EESCHEMA_SETTINGS>( "eeschema" );
@@ -913,7 +913,7 @@ void SYMBOL_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTex
     GetCanvas()->GetGAL()->DrawGrid();
     GetCanvas()->ForceRefresh();
 
-    if( aEnvVarsChanged )
+    if( aFlags && ENVVARS_CHANGED )
         ReCreateLibList();
 }
 

eeschema/symbol_viewer_frame.h

@@ -87,7 +87,7 @@ public:
 
     WINDOW_SETTINGS* GetWindowSettings( APP_SETTINGS_BASE* aCfg ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     /**
      * Set the selected library in the library window.

gerbview/gerbview_frame.cpp

@@ -1210,9 +1210,9 @@ void GERBVIEW_FRAME::setupUIConditions()
 }
 
 
-void GERBVIEW_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void GERBVIEW_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aFlags );
 
     // Update gal display options like cursor shape, grid options:
     SETTINGS_MANAGER&  mgr = Pgm().GetSettingsManager();

gerbview/gerbview_frame.h

@@ -376,7 +376,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     SELECTION& GetCurrentSelection() override;
 

include/eda_base_frame.h

@@ -498,7 +498,7 @@ public:
      * Notification event that some of the common (suite-wide) settings have changed.
      * Update menus, toolbars, local variables, etc.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     /**
      * Process light/dark theme change.

include/eda_draw_frame.h

@@ -196,7 +196,7 @@ public:
                              const wxString& ext, bool isDirectory = false, bool aIsGlobal = false,
                              const wxString& aGlobalPath = wxEmptyString );
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     virtual wxString GetScreenDesc() const;
     virtual wxString GetFullScreenDesc() const;

include/kiway.h

@@ -401,7 +401,7 @@ public:
      *
      * Use after changing suite-wide options such as panning, autosave interval, etc.
      */
-    virtual void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged );
+    virtual void CommonSettingsChanged( int aFlags );
 
     /**
      * Calls ProjectChanged() on all KIWAY_PLAYERs.

include/pcb_base_frame.h

@@ -364,7 +364,7 @@ public:
 
     virtual MAGNETIC_SETTINGS* GetMagneticItemsSettings();
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     PCB_DRAW_PANEL_GAL* GetCanvas() const override;
 

include/tool/tools_holder.h

@@ -149,11 +149,15 @@ public:
      */
     bool GetMoveWarpsCursor() const { return m_moveWarpsCursor; }
 
+#define ENVVARS_CHANGED  0x0001
+#define TEXTVARS_CHANGED 0x0002
+#define HOTKEYS_CHANGED  0x0004
+
     /**
      * Notification event that some of the common (suite-wide) settings have changed.
      * Update hotkeys, preferences, etc.
      */
-    virtual void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged );
+    virtual void CommonSettingsChanged( int aFlags = 0 );
 
     /**
      * Canvas access.

kicad/kicad_manager_frame.cpp

@@ -1010,14 +1010,12 @@ void KICAD_MANAGER_FRAME::ShowChangedLanguage()
 }
 
 
-void KICAD_MANAGER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void KICAD_MANAGER_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_BASE_FRAME::CommonSettingsChanged( aFlags );
 
-    if( m_pcm && aEnvVarsChanged )
-    {
+    if( m_pcm && ( aFlags & ENVVARS_CHANGED ) )
         m_pcm->ReadEnvVar();
-    }
 
     COMMON_SETTINGS* settings = Pgm().GetCommonSettings();
 

kicad/kicad_manager_frame.h

@@ -156,7 +156,7 @@ public:
     void SaveSettings( APP_SETTINGS_BASE* aCfg ) override;
 
     void ShowChangedLanguage() override;
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
     void ProjectChanged() override;
 
     /**

pagelayout_editor/pl_editor_frame.cpp

@@ -634,9 +634,9 @@ void PL_EDITOR_FRAME::SetTitleBlock( const TITLE_BLOCK& aTitleBlock )
 }
 
 
-void PL_EDITOR_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void PL_EDITOR_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aFlags );
 
     SETTINGS_MANAGER&   mgr = Pgm().GetSettingsManager();
     PL_EDITOR_SETTINGS* cfg = mgr.GetAppSettings<PL_EDITOR_SETTINGS>( "pl_editor" );

pagelayout_editor/pl_editor_frame.h

@@ -121,7 +121,7 @@ public:
     const TITLE_BLOCK& GetTitleBlock() const override;
     void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     void DisplayGridMsg() override;
 

pcbnew/footprint_edit_frame.cpp

@@ -1398,9 +1398,9 @@ void FOOTPRINT_EDIT_FRAME::ActivateGalCanvas()
 }
 
 
-void FOOTPRINT_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void FOOTPRINT_EDIT_FRAME::CommonSettingsChanged( int aFlags )
 {
-    PCB_BASE_EDIT_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    PCB_BASE_EDIT_FRAME::CommonSettingsChanged( aFlags );
 
     SETTINGS_MANAGER&          mgr = Pgm().GetSettingsManager();
     FOOTPRINT_EDITOR_SETTINGS* cfg = mgr.GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );
@@ -1415,7 +1415,7 @@ void FOOTPRINT_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTe
 
     UpdateUserInterface();
 
-    if( aEnvVarsChanged )
+    if( aFlags & ENVVARS_CHANGED )
         SyncLibraryTree( true );
 
     Layout();

pcbnew/footprint_edit_frame.h

@@ -293,7 +293,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     LIB_TREE* GetLibTree() const override
     {

pcbnew/footprint_viewer_frame.cpp

@@ -873,13 +873,13 @@ COLOR_SETTINGS* FOOTPRINT_VIEWER_FRAME::GetColorSettings( bool aForceRefresh ) c
 }
 
 
-void FOOTPRINT_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void FOOTPRINT_VIEWER_FRAME::CommonSettingsChanged( int aFlags )
 {
-    PCB_BASE_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    PCB_BASE_FRAME::CommonSettingsChanged( aFlags );
 
     GetCanvas()->ForceRefresh();
 
-    if( aEnvVarsChanged )
+    if( aFlags & ENVVARS_CHANGED )
         ReCreateLibraryList();
 }
 

pcbnew/footprint_viewer_frame.h

@@ -138,7 +138,7 @@ private:
 
     WINDOW_SETTINGS* GetWindowSettings( APP_SETTINGS_BASE* aCfg ) override;
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     /**
      * Called when the frame frame is activate to reload the libraries and component lists

pcbnew/pcb_base_frame.cpp

@@ -934,9 +934,9 @@ MAGNETIC_SETTINGS* PCB_BASE_FRAME::GetMagneticItemsSettings()
 }
 
 
-void PCB_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void PCB_BASE_FRAME::CommonSettingsChanged( int aFlags )
 {
-    EDA_DRAW_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    EDA_DRAW_FRAME::CommonSettingsChanged( aFlags );
 
     KIGFX::VIEW*         view = GetCanvas()->GetView();
     KIGFX::PCB_PAINTER*  painter = static_cast<KIGFX::PCB_PAINTER*>( view->GetPainter() );
@@ -946,7 +946,7 @@ void PCB_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVars
     settings->LoadDisplayOptions( GetDisplayOptions() );
     settings->m_ForceShowFieldsWhenFPSelected = GetPcbNewSettings()->m_Display.m_ForceShowFieldsWhenFPSelected;
 
-    if( aTextVarsChanged )
+    if( aFlags & TEXTVARS_CHANGED )
         GetBoard()->SynchronizeProperties();
 
     // Note: KIGFX::REPAINT isn't enough for things that go from invisible to visible as
@@ -987,7 +987,7 @@ void PCB_BASE_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVars
     EDA_3D_VIEWER_FRAME* viewer = Get3DViewerFrame();
 
     if( viewer )
-        viewer->CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+        viewer->CommonSettingsChanged( aFlags );
 }
 
 

pcbnew/pcb_edit_frame.cpp

@@ -1348,7 +1348,7 @@ void PCB_EDIT_FRAME::ShowBoardSetupDialog( const wxString& aInitialPage )
         // We don't know if anything was modified, so err on the side of requiring a save
         OnModify();
 
-        Kiway().CommonSettingsChanged( false, true );
+        Kiway().CommonSettingsChanged( TEXTVARS_CHANGED );
 
         Prj().IncrementTextVarsTicker();
         Prj().IncrementNetclassesTicker();
@@ -2533,9 +2533,9 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew,
 }
 
 
-void PCB_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged )
+void PCB_EDIT_FRAME::CommonSettingsChanged( int aFlags )
 {
-    PCB_BASE_EDIT_FRAME::CommonSettingsChanged( aEnvVarsChanged, aTextVarsChanged );
+    PCB_BASE_EDIT_FRAME::CommonSettingsChanged( aFlags );
 
     GetAppearancePanel()->OnColorThemeChanged();
 
@@ -2577,7 +2577,7 @@ void PCB_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVars
     GetCanvas()->ForceRefresh();
 
     // Update the environment variables in the Python interpreter
-    if( aEnvVarsChanged )
+    if( aFlags & ENVVARS_CHANGED )
         PythonSyncEnvironmentVariables();
 
     Layout();

pcbnew/pcb_edit_frame.h

@@ -706,7 +706,7 @@ public:
     /**
      * Called after the preferences dialog is run.
      */
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+    void CommonSettingsChanged( int aFlags ) override;
 
     /**
      * Called when light/dark theme is changed.

pcbnew/pcbnew.cpp

@@ -136,7 +136,7 @@ static struct IFACE : public KIFACE_BASE, public UNITS_PROVIDER
 
             // Use QuasiModal so that HTML help window will work
             if( dlg.ShowQuasiModal() == wxID_OK )
-                aKiway->CommonSettingsChanged( true, false );
+                aKiway->CommonSettingsChanged( ENVVARS_CHANGED );
 
             // Dialog has completed; nothing to return.
             return nullptr;