1 files changed, 12 insertions, 5 deletions

diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp
index 1287d90..eef42df 100644
--- a/noncore/net/networksetup/interfaces.cpp
+++ b/noncore/net/networksetup/interfaces.cpp
@@ -346,7 +346,7 @@ bool Interfaces::setMapping(QString interface){
  * @param interface the name(s) of the interfaces to set to this mapping
  */ 
-void Interfaces::addMapping(QString interfaces){
+void Interfaces::addMapping(QString option){
   interfaces.append("");
-  interfaces.append(QString(MAPPING " %1").arg(interfaces));
+  interfaces.append(QString(MAPPING " %1").arg(option));
 }
 
@@ -405,9 +405,10 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator
         qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1());
       }
+      qDebug("Found");
       found = true;
       iterator = it;
     }
   }
-  return !found;
+  return found;
 }
 
@@ -429,7 +430,8 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
         interfaces.insert(--it, QString("\t%1 %2").arg(option).arg(value));
       }
+      found = true;
       break;
     }
-    if((*it).contains(option)){
+    if((*it).contains(option) && it != start){
       // Found it in stanza so replace it.
       if(found)
@@ -442,5 +444,10 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString
     }
   }
-  return true;
+  if(!found){
+    QStringList::Iterator p = start;
+    interfaces.insert(++p, QString("\t%1 %2").arg(option).arg(value));
+    found = true;
+  }
+  return found;
 }