2 files changed, 14 insertions, 5 deletions

diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index 6ab2dd6..bda9d7e 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -108,33 +108,36 @@ EditNetworkSetup::EditNetworkSetup( QWidget* parent ) :
 NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
 
       if( TmpIsValid ) 
         // content is stil OK
         return &(TmpCollection);
 
       // reset collection -> delete all NEW NetNodes
       for( QListIterator<ANetNodeInstance> it(TmpCollection);
            it.current();
            ++it ) {
         if( it.current()->isNew() ) {
           delete it.current();
         }
       }
 
       TmpCollection.clear();
-      TmpCollection.copyFrom( *SelectedNodes );
+      if( SelectedNodes ) {
+        // initialize like original
+        TmpCollection.copyFrom( *SelectedNodes );
+      }
 
       // update content
       QListViewItem * it = Nodes_LV->firstChild();
       ANetNode * NN;
 
       // start iter (if there is a collection)
       /*
 
           a node collection is sorted from the toplevel
           node to the deepest node
 
       */
       ANetNodeInstance * NNI = 
         (SelectedNodes) ? SelectedNodes->first() : 0 ;
 
       TmpCollection.setModified( 0 );
@@ -443,35 +446,41 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
       if( NN ) {
         // figure out type of this node -> produce mesage
         Description_LBL->setText( NSResources->netNode2Description(
                                   NN->needs()[0]) );
       } else {
         Description_LBL->setText( "" );
       }
       return;
     }
 
     Description_LBL->setText( NN->nodeDescription() );
 
     if( ! it->isSelectable() ) {
       return;
     }
 
-    if( ! ((QCheckListItem *)it)->isOn() ) {
-      // clicked on line but NOT on Check or Radio item
-      return;
+    ANetNode::NetNodeList & NNL = NN->alternatives();
+
+    if( NNL.size() != 1 ) {
+      if( NNL.size() == 0 ||
+        ! ((MyQCheckListItem *)it)->isOn() 
+      ) {
+        // not clicked on Check or Radio item
+        return;
+      }
     }
 
     // item has really changed -> update 
     TmpIsValid = 0;
     updateGUI( it, NN );
 }
 
 // cliecked on TAB to go to setup
 void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
     if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) {
       // switched to setup -> update CB and populate ws with
       // forms for devices
 
       if( ! TmpIsValid ) {
         getTmpCollection();
 
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index b4622fc..835c7c3 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -708,33 +708,33 @@ bool NetworkSettingsData::canStart( const QString & Interface ) {
         case Off :
           // try to UP the device
           { QString S= NC->setState( Activate );
             if( ! S.isEmpty() ) {
               // could not bring device Online -> try other alters
               Log(( "disallow %ld for %s : %s\n", 
                   NC->number(), Interface.latin1(), S.latin1() ));
               break;
             }
             // interface assigned 
           }
           // FT
         case Available :
         case IsUp : // also called for 'ifdown'
           // device is ready -> done
           Log(( "allow %ld for %s\n", NC->number(), Interface.latin1()));
-          printf( "A%ld%s\n", NC->number(), Interface.latin1() );
+          printf( "A%d%s\n", NC->number(), Interface.latin1() );
           return 0;
       }
     } 
 
     // if we come here no alternatives are possible
     Log(( "disallow %s\n", Interface.latin1()));
     printf( "D-%s\n", Interface.latin1() );
     return 0;
 }
 
 bool NetworkSettingsData::isModified( void ) {
     if( ForceModified )
       return 1;
 
     for( QDictIterator<NetworkSetup> it(NSResources->networkSetups());
          it.current();