Run CommonSettingsChanged after all panels have been committed.

Fixes: lp:1787377 * https://bugs.launchpad.net/kicad/+bug/1787377
equalll · Aug 21, 2018 · 2e5d806 · 2e5d806
1 parent 7793988
commit 2e5d806
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp
@@ -113,8 +113,6 @@ bool PANEL_COMMON_SETTINGS::TransferDataFromWindow()
     Pgm().ForceSystemPdfBrowser( m_defaultPDFViewer->GetValue() );
     Pgm().WritePdfBrowserInfos();
 
-    m_dialog->Kiway().CommonSettingsChanged();
-
     return true;
 }
 

diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
@@ -527,7 +527,13 @@ bool EDA_BASE_FRAME::ShowPreferences( EDA_HOTKEY_CONFIG* aHotkeys, EDA_HOTKEY_CO
             frame->InstallPreferences( &dlg );
     }
 
-    return( dlg.ShowModal() != wxID_CANCEL );
+    if( dlg.ShowModal() == wxID_OK )
+    {
+        dlg.Kiway().CommonSettingsChanged();
+        return true;
+    }
+
+    return false;
 }