From a846a0be197d3a6ff7f8c76a3ba322db0da7d058 Mon Sep 17 00:00:00 2001
From: wimpie <wimpie>
Date: Wed, 12 Jan 2005 00:29:48 +0000
Subject: Fixed Crash in editing new profiles

---
(limited to 'noncore/settings')

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
@@ -121,7 +121,10 @@ NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
       }
 
       TmpCollection.clear();
-      TmpCollection.copyFrom( *SelectedNodes );
+      if( SelectedNodes ) {
+        // initialize like original
+        TmpCollection.copyFrom( *SelectedNodes );
+      }
 
       // update content
       QListViewItem * it = Nodes_LV->firstChild();
@@ -456,9 +459,15 @@ void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
       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 
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
@@ -721,7 +721,7 @@ bool NetworkSettingsData::canStart( const QString & Interface ) {
         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;
       }
     } 
--
cgit v0.9.0.2