1 files changed, 3 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 67cae1c..e57cdef 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -639,21 +639,21 @@ const ODeviceButton *ODevice::buttonForKeycode ( ushort code )
         if ( (*it). keycode() == code )
             return &(*it);
     }
     return 0;
 }
 
 void ODevice::reloadButtonMapping()
 {
-    initButtons();
+    if(!d->m_buttons)
+        initButtons();
     
     if(!d->m_initializedButtonQcop) {
-        QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel");
-        connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
+        connect(qApp,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)),
                 this,SLOT(systemMessage(const QCString&,const QByteArray&)));
         d->m_initializedButtonQcop = true;
     }
 
     Config cfg ( "ButtonSettings" );
 
     for ( uint i = 0; i < d->m_buttons->count(); i++ ) {
         ODeviceButton &b = ( *d->m_buttons ) [i];