Get a bit more of the input device class working - using lumina-config for testing on the new "mouse" page (which is still disabled for the moment).

1 files changed, 4 insertions, 4 deletions

diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp
index a760d19d..79f5c27f 100644
--- a/src-qt5/core/libLumina/LInputDevice.cpp
+++ b/src-qt5/core/libLumina/LInputDevice.cpp
@@ -69,17 +69,17 @@ QList<LInputDevice*> LInput::listDevices(){
   xcb_input_list_input_devices_reply_t *reply = xcb_input_list_input_devices_reply(QX11Info::connection(), cookie, NULL);
   if(reply==0){ return devices; } //error - nothing returned
   //Use the iterator for going through the reply
+  //qDebug() << "Create iterator";
   xcb_input_device_info_iterator_t iter = xcb_input_list_input_devices_devices_iterator(reply);
   //xcb_str_iterator_t nameiter = xcb_input_list_input_devices_names_iterator(reply);
 
   //Now step through the reply
-  QStringList info;
   while(iter.data != 0 ){
     devices << new LInputDevice(iter.data->device_id, iter.data->device_use);
-    //qDebug() << "Input Device:" << iter.data->device_id;
+    //qDebug() << "Found Input Device:" << iter.data->device_id;
     //qDebug() << "  - num_class_info:" << iter.data->num_class_info;
-    xcb_input_device_info_next(&iter);
-    //xcb_input_device_name_next(&nameiter);
+    if(iter.rem>0){ xcb_input_device_info_next(&iter); }
+    else{ break; }
   }
   //Free the reply (done with it)
   ::free(reply);