BUGFIX: didnt call setProfile on interfaces for which a module exists, were only calling it on standard InterfaceSetupImpDialog interfaces.

1 files changed, 6 insertions, 5 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 50131d8..7e24cda 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -190,10 +190,8 @@ void MainWindowImp::getAllInterfaces(){
     Interface *i = NULL;

 

     strcpy(ifr.ifr_name, (*it).latin1());

 

-    qWarning("ifr.ifr_name=%s\n", ifr.ifr_name); 

-

     struct ifreq ifcopy;

     ifcopy = ifr;

     result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);

     flags = ifcopy.ifr_flags;

@@ -388,21 +386,24 @@ void MainWindowImp::configureClicked(){
     QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);

     return;

   } 

 

+  QString currentProfileText = currentProfileLabel->text();

+  if(currentProfileText.upper() == "ALL");

+    currentProfileText = "";

+

   Interface *i = interfaceItems[item];

+

   if(i->getModuleOwner()){

     QWidget *moduleConfigure = i->getModuleOwner()->configure(i);

     if(moduleConfigure != NULL){

+      i->getModuleOwner()->setProfile(currentProfileText);

       moduleConfigure->showMaximized();

       return;

     }

   }

   

   InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );

-  QString currentProfileText = currentProfileLabel->text();

-  if(currentProfileText.upper() == "ALL");

-    currentProfileText = "";

   configure->setProfile(currentProfileText);

   configure->showMaximized();

 }