summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp6
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 44c721a..6a56358 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -173,7 +173,7 @@ void WLANImp::changeAndSaveSettingFile(){
stream << " open";
else
stream << " restricted";
- stream << "\n\"";
+ stream << "\"\n";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
@@ -182,7 +182,7 @@ void WLANImp::changeAndSaveSettingFile(){
}
if(line.contains(";;"))
output = true;
- if(output)
+ if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
@@ -208,8 +208,6 @@ void WLANImp::accept(){
if(!interfaceSetup->saveChanges())
return;
- QDialog::accept();
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 44c721a..6a56358 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -173,7 +173,7 @@ void WLANImp::changeAndSaveSettingFile(){
stream << " open";
else
stream << " restricted";
- stream << "\n\"";
+ stream << "\"\n";
}
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
stream << "\tRATE=auto\n";
@@ -182,7 +182,7 @@ void WLANImp::changeAndSaveSettingFile(){
}
if(line.contains(";;"))
output = true;
- if(output)
+ if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
@@ -208,8 +208,6 @@ void WLANImp::accept(){
if(!interfaceSetup->saveChanges())
return;
- QDialog::accept();
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )