[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdelirc
From:       Michael Zanetti <michael_zanetti () gmx ! net>
Date:       2010-03-01 0:44:44
Message-ID: 1267404284.973110.1429.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097363 by mzanetti:

fix duplicate Master mode in list


 M  +4 -4      kded/kremotecontroldaemon.cpp  
 M  +4 -1      libkremotecontrol/remote.cpp  


--- branches/work/kdelirc/kded/kremotecontroldaemon.cpp #1097362:1097363
@@ -257,12 +257,12 @@
 
 
 QStringList KRemoteControlDaemon::getModesForRemote(const QString& remoteName) {
-  QStringList list;
+    QStringList list;
     Remote *remote = d_ptr->remoteList().getRemote(remoteName);
     if(remote){
-      foreach(Mode *mode, remote-> allModes()){
-	list << mode->name();
-      }
+        foreach(const Mode *mode, remote->allModes()){
+            list << mode->name();
+        }
     }
     return list;
 }
--- branches/work/kdelirc/libkremotecontrol/remote.cpp #1097362:1097363
@@ -264,7 +264,10 @@
 }
 
 void Remote::addMode(Mode* mode) {
-    m_modechangeHandler->addMode(mode);
+    // Don't add a second master mode
+    if(mode != masterMode() && mode->name() != "Master"){
+        m_modechangeHandler->addMode(mode);
+    }
 }
 
 void Remote::removeMode(Mode *mode) {
[prev in list] [next in list] [prev in thread] [next in thread]