1 files changed, 10 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 8b64c41..67cae1c 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -179,4 +179,7 @@ ODevice::ODevice()
     d->m_sound = d->m_vol   = d->m_mixer = -1;
 
+    /* System QCopChannel created */
+    d->m_initializedButtonQcop = false;
+
     // New distribution detection code first checks for legacy distributions,
     // identified by /etc/familiar-version or /etc/oz_version.
@@ -234,7 +237,4 @@ void ODevice::initButtons()
 
     reloadButtonMapping();
-
-    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
 
@@ -647,4 +647,11 @@ void ODevice::reloadButtonMapping()
     initButtons();
 
+    if(!d->m_initializedButtonQcop) {
+        QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel");
+        connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
+                this,SLOT(systemMessage(const QCString&,const QByteArray&)));
+        d->m_initializedButtonQcop = true;
+    }
+
     Config cfg ( "ButtonSettings" );