1 files changed, 8 insertions, 0 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index c71514c..8b0b0a8 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -62,2 +62,3 @@ ButtonSettings::ButtonSettings ( )
         const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
+        (void) ButtonUtils::inst ( ); // initialise
 
@@ -135,2 +136,3 @@ ButtonSettings::ButtonSettings ( )
         m_last_button = 0;
+        m_lock = false;
         
@@ -210,2 +212,6 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
         
+        if ( m_lock )
+                return;
+        m_lock = true;
+        
         RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
@@ -229,2 +235,4 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
         delete d;
+        
+        m_lock = false;
 }