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
@@ -39,48 +39,49 @@
 
 using namespace Opie;
 
 struct buttoninfo {
 	const ODeviceButton *m_button;
 	int          m_index;
 
 	OQCopMessage m_pmsg;
 	QLabel      *m_picon;
 	QLabel      *m_plabel;
 
 	OQCopMessage m_hmsg;
 	QLabel      *m_hicon;
 	QLabel      *m_hlabel;
 	
 	bool        m_pdirty : 1;
 	bool        m_hdirty : 1;
 };
 
 
 ButtonSettings::ButtonSettings ( ) 
 	: QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp )
 {
 	const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
+	(void) ButtonUtils::inst ( ); // initialise
 
 	setCaption ( tr( "Button Settings" ));
 
 	QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
 	
 	QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this );
 	toplay-> addWidget ( l );
 	
 	QGridLayout *lay = new QGridLayout ( toplay );
 	lay-> setMargin ( 0 );
 	lay-> setColStretch ( 0, 0 );
 	lay-> setColStretch ( 1, 0 );
 	lay-> setColStretch ( 2, 0 );
 	lay-> setColStretch ( 3, 10 );
 
 	m_infos. setAutoDelete ( true );
 	
 	int i = 1;
 	int index = 0;
 	for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
 		if ( it != buttons. begin ( )) {
 			QFrame *f = new QFrame ( this );
 			f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
 			lay-> addMultiCellWidget ( f, i, i, 0, 2 );
@@ -112,48 +113,49 @@ ButtonSettings::ButtonSettings ( )
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
 		bi-> m_plabel = l;
 		
 		l = new QLabel ( this );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
 		bi-> m_hicon = l;
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
 		bi-> m_hlabel = l;
 		
 		i += 2;
 		
 		m_infos. append ( bi );
 	}	
 
 	toplay-> addStretch ( 10 );
 
 	m_last_button = 0;
+	m_lock = false;
 	
 	m_timer = new QTimer ( this );
 	connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( )));
 
 	updateLabels ( );	
 	
 	QPEApplication::grabKeyboard ( );
 }
 
 ButtonSettings::~ButtonSettings ( )
 {
 	QPEApplication::ungrabKeyboard ( );
 }
 
 void ButtonSettings::updateLabels ( )
 {
 	for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
 		qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
 		
 		(*it)-> m_picon-> setPixmap ( cip. m_icon );
 		(*it)-> m_plabel-> setText ( cip. m_name );
 
 		qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg );
 
@@ -187,63 +189,69 @@ void ButtonSettings::keyPressEvent ( QKeyEvent *e )
 void ButtonSettings::keyReleaseEvent ( QKeyEvent *e )
 {
 	buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 	
 	if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) {
 		m_timer-> stop ( );
 		edit ( bi, false );		
 	}
 	else
 		QDialog::keyReleaseEvent ( e );
 }
 
 void ButtonSettings::keyTimeout ( )
 {
 	if ( m_last_button ) {
 		edit ( m_last_button, true );
 		m_last_button = false;
 	}
 }
 
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {
 	qDebug ( "remap %s for %s", hold ? "hold" : "press", bi-> m_button-> userText ( ). latin1 ( )); 	
 	
+	if ( m_lock )
+		return;
+	m_lock = true;
+	
 	RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
 
 	d-> showMaximized ( );	
 	if ( d-> exec ( ) == QDialog::Accepted ) {
 		qDebug ( " -> %s %s", d-> message ( ). channel ( ). data ( ), d-> message ( ). message ( ). data ( ));
 	
 		if ( hold ) {
 			bi-> m_hmsg = d-> message ( );
 			bi-> m_hdirty = true;
 		}
 		else {
 			bi-> m_pmsg = d-> message ( );
 			bi-> m_pdirty = true;
 		}
 	
 		updateLabels ( );
 	}
 		
 	delete d;
+	
+	m_lock = false;
 }
 
 void ButtonSettings::accept ( )
 {
 	for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
 		buttoninfo *bi = *it;
 		
 		if ( bi-> m_pdirty )
 			ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg );
 		if ( bi-> m_hdirty )
 			ODevice::inst ( )-> remapHeldAction ( bi-> m_index, bi-> m_hmsg );
 	}
 	QDialog::accept ( );
 }
 
 void ButtonSettings::done ( int r )
 {
 	QDialog::done ( r );
 	close ( );
 }