1 files changed, 23 insertions, 11 deletions

diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index e1110e2..c3e6572 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -169,4 +169,6 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
     // disable refresh timer 
     UpdateTimer->stop();
+    // we need to retry
+    while( 1 ) {
     if( EC.exec() == QDialog::Accepted ) {
       // toplevel item -> store
@@ -175,8 +177,22 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
         setModified( 1 );
         if( LBI ) {
+            if( NC->name() != OldName ) {
+              // find if new name is free
+              NodeCollection * LCN = NSResources->findConnection(
+                    NC->name() );
+              if( LCN ) {
+                QMessageBox::warning(
+                  0, 
+                  tr( "Generating system configuration" ),
+                  tr( "Name %1 already exists" ).arg(NC->name())
+                );
+                continue; // restart exec
+              } // else new name
           // new name -> remove item
           NSResources->removeConnection( OldName );
-          // must add it here since change will trigger event
           NSResources->addConnection( NC );
+            } // else not changed
+
+            // must add it here since change will trigger event
           Profiles_LB->changeItem( NC->devicePixmap(),
                                    NC->name(),
@@ -200,4 +216,6 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
       }
     }
+      break;
+    }
     // reenable 
     UpdateTimer->start( 5000 );
@@ -334,13 +352,8 @@ void NetworkSettings::SLOT_On( void ) {
         rv = NC->setState( Activate );
         break;
-      case Available :
-        // deactivate
+      case Available : // deactivate
+      case IsUp : // deactivate (will also bring down if needed)
         rv = NC->setState( Deactivate );
         break;
-      case IsUp :
-        // bring down and deactivate
-        rv = ( NC->setState( Down ) &&
-               NC->setState( Deactivate ) );
-        break;
       default :
         // others no change
@@ -367,5 +380,5 @@ void NetworkSettings::SLOT_Connect( void ) {
         NSResources->findConnection( LBI->text() );
 
-    bool rv;
+    bool rv = 1 ;
     switch( NC->state() ) {
       case IsUp :
@@ -384,5 +397,5 @@ void NetworkSettings::SLOT_Connect( void ) {
       default :
         // others no change
-        return;
+        break;
     } 
 
@@ -392,5 +405,4 @@ void NetworkSettings::SLOT_Connect( void ) {
           tr( "Activating profile" ),
           tr( "Cannot enable profile" ) );
-      return;
     }