From d72f827984f71c4fcb3e18a217c54ef367a87873 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Tue, 9 Sep 2014 02:29:59 +0400
Subject: [PATCH] fix empty values

---
 sources/awesome-widget/configuration.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index ccd7c91..115473c 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -182,7 +182,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     for (int i=0; i<configuration[QString("tempDevice")].split(QString("@@")).count(); i++) {
         QList<QListWidgetItem *> items = uiAdvancedConfig.listWidget_tempDevice
                 ->findItems(configuration[QString("tempDevice")].split(QString("@@"))[i], Qt::MatchFixedString);
-        if (items.isEmpty()) {
+        if ((items.isEmpty()) &&
+                (!configuration[QString("tempDevice")].split(QString("@@"))[i].isEmpty())) {
             QListWidgetItem *item = new QListWidgetItem(configuration[QString("tempDevice")].split(QString("@@"))[i]);
             item->setCheckState(Qt::Checked);
             uiAdvancedConfig.listWidget_tempDevice->addItem(item);
@@ -207,7 +208,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     for (int i=0; i<configuration[QString("mount")].split(QString("@@")).count(); i++) {
         QList<QListWidgetItem *> items = uiAdvancedConfig.listWidget_mount
                 ->findItems(configuration[QString("mount")].split(QString("@@"))[i], Qt::MatchFixedString);
-        if (items.isEmpty()) {
+        if ((items.isEmpty()) &&
+                (!configuration[QString("mount")].split(QString("@@"))[i].isEmpty())) {
             QListWidgetItem *item = new QListWidgetItem(configuration[QString("mount")].split(QString("@@"))[i]);
             item->setCheckState(Qt::Checked);
             uiAdvancedConfig.listWidget_mount->addItem(item);
@@ -224,7 +226,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     for (int i=0; i<configuration[QString("disk")].split(QString("@@")).count(); i++) {
         QList<QListWidgetItem *> items = uiAdvancedConfig.listWidget_hddSpeedDevice
                 ->findItems(configuration[QString("disk")].split(QString("@@"))[i], Qt::MatchFixedString);
-        if (items.isEmpty()) {
+        if ((items.isEmpty()) &&
+                (!configuration[QString("disk")].split(QString("@@"))[i].isEmpty())) {
             QListWidgetItem *item = new QListWidgetItem(configuration[QString("disk")].split(QString("@@"))[i]);
             item->setCheckState(Qt::Checked);
             uiAdvancedConfig.listWidget_hddSpeedDevice->addItem(item);
@@ -248,7 +251,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     for (int i=0; i<configuration[QString("hdd")].split(QString("@@")).count(); i++) {
         QList<QListWidgetItem *> items = uiAdvancedConfig.listWidget_hddDevice
                 ->findItems(configuration[QString("hdd")].split(QString("@@"))[i], Qt::MatchFixedString);
-        if (items.isEmpty()) {
+        if ((items.isEmpty()) &&
+                (!configuration[QString("hdd")].split(QString("@@"))[i].isEmpty())) {
             QListWidgetItem *item = new QListWidgetItem(configuration[QString("hdd")].split(QString("@@"))[i]);
             item->setCheckState(Qt::Checked);
             uiAdvancedConfig.listWidget_hddDevice->addItem(item);
@@ -264,6 +268,9 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
     QStringList interfaceList;
     for (int i=0; i<rawInterfaceList.count(); i++)
         interfaceList.append(rawInterfaceList[i].name());
+    if ((!interfaceList.contains(configuration[QString("customNetdev")])) &&
+            (!configuration[QString("customNetdev")].isEmpty()))
+        interfaceList.append(configuration[QString("customNetdev")]);
     uiAdvancedConfig.comboBox_netdev->clear();
     uiAdvancedConfig.comboBox_netdev->addItems(interfaceList);
     uiAdvancedConfig.comboBox_netdev->setCurrentIndex(