From 2e5d8061aa73b19f6a32d43197fc88376a324f49 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 19 Aug 2018 17:06:59 +0100
Subject: [PATCH] Run CommonSettingsChanged after all panels have been
 committed.

Fixes: lp:1787377
* https://bugs.launchpad.net/kicad/+bug/1787377
---
 common/dialogs/panel_common_settings.cpp | 2 --
 common/eda_base_frame.cpp                | 8 +++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp
index 738f9b53fa..3eff06ecaa 100644
--- 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
index 45eec98450..dd74ec4ce9 100644
--- 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;
 }