2 files changed, 9 insertions, 12 deletions

diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 2a5520d..fc65c5f 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -15,12 +15,9 @@
  * Constuctor.  Set up the connection. A profile must be set.
  */ 
-InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interfaces(j), interface(i), delInterfaces(false){
-}
-
-/**
- * Constuctor.  Set up the connection. A profile must be set.
- */ 
-InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), delInterfaces(true){
-  interfaces = new Interfaces;
+InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
+  if (j == 0) {
+    delInterfaces = true;
+    interfaces = new Interfaces;
+  }
 }
 
@@ -29,6 +26,7 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
  */ 
 InterfaceSetupImp::~InterfaceSetupImp(){
-  if(delInterfaces)
+  if(delInterfaces) {
     delete interfaces;
+  }
 }
 
@@ -63,5 +61,5 @@ bool InterfaceSetupImp::saveSettings(){
    return false;
   }	
-  interfaces->removeAllInterfaceOptions();
+  //interfaces.removeAllInterfaceOptions();
   
   // DHCP
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index c4ace77..172da6a 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -12,5 +12,4 @@ class InterfaceSetupImp : public InterfaceSetup {
 	
 public:
-  InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i = 0, WFlags fl = 0);
   InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i = 0, Interfaces *j = 0, WFlags fl = 0);
   ~InterfaceSetupImp();
@@ -38,5 +37,5 @@ public:
     QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this );
     setCaption("Interface Setup");
-    interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl);
+    interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i);
     InterfaceSetupLayout->addWidget( interfaceSetup );
   };