summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -170,22 +170,22 @@ void WLANImp::changeAndSaveSettingFile(){
170 if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); 170 if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
171 if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); 171 if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
172 if(authOpen->isChecked()) 172 if(authOpen->isChecked())
173 stream << " open"; 173 stream << " open";
174 else 174 else
175 stream << " restricted"; 175 stream << " restricted";
176 stream << "\n\""; 176 stream << "\"\n";
177 } 177 }
178 stream << "\tCHANNEL=" << networkChannel->value() << "\n"; 178 stream << "\tCHANNEL=" << networkChannel->value() << "\n";
179 stream << "\tRATE=auto\n"; 179 stream << "\tRATE=auto\n";
180 if(line.contains("esac")) 180 if(line.contains("esac"))
181 stream << line << "\n"; 181 stream << line << "\n";
182 } 182 }
183 if(line.contains(";;")) 183 if(line.contains(";;"))
184 output = true; 184 output = true;
185 if(output) 185 if(output && (*it).length() )
186 stream << (*it) << '\n'; 186 stream << (*it) << '\n';
187 } 187 }
188 file.close(); 188 file.close();
189} 189}
190 190
191/** 191/**
@@ -205,14 +205,12 @@ void WLANImp::accept(){
205 changeAndSaveSettingFile(); 205 changeAndSaveSettingFile();
206 206
207 // Try to save the interfaces settings. 207 // Try to save the interfaces settings.
208 if(!interfaceSetup->saveChanges()) 208 if(!interfaceSetup->saveChanges())
209 return; 209 return;
210 210
211 QDialog::accept();
212 return;
213 // Restart the device now that the settings have changed 211 // Restart the device now that the settings have changed
214 QString initpath; 212 QString initpath;
215 if( QDir("/etc/rc.d/init.d").exists() ) 213 if( QDir("/etc/rc.d/init.d").exists() )
216 initpath = "/etc/rc.d/init.d"; 214 initpath = "/etc/rc.d/init.d";
217 else if( QDir("/etc/init.d").exists() ) 215 else if( QDir("/etc/init.d").exists() )
218 initpath = "/etc/init.d"; 216 initpath = "/etc/init.d";
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
@@ -170,22 +170,22 @@ void WLANImp::changeAndSaveSettingFile(){
170 if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); 170 if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
171 if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); 171 if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
172 if(authOpen->isChecked()) 172 if(authOpen->isChecked())
173 stream << " open"; 173 stream << " open";
174 else 174 else
175 stream << " restricted"; 175 stream << " restricted";
176 stream << "\n\""; 176 stream << "\"\n";
177 } 177 }
178 stream << "\tCHANNEL=" << networkChannel->value() << "\n"; 178 stream << "\tCHANNEL=" << networkChannel->value() << "\n";
179 stream << "\tRATE=auto\n"; 179 stream << "\tRATE=auto\n";
180 if(line.contains("esac")) 180 if(line.contains("esac"))
181 stream << line << "\n"; 181 stream << line << "\n";
182 } 182 }
183 if(line.contains(";;")) 183 if(line.contains(";;"))
184 output = true; 184 output = true;
185 if(output) 185 if(output && (*it).length() )
186 stream << (*it) << '\n'; 186 stream << (*it) << '\n';
187 } 187 }
188 file.close(); 188 file.close();
189} 189}
190 190
191/** 191/**
@@ -205,14 +205,12 @@ void WLANImp::accept(){
205 changeAndSaveSettingFile(); 205 changeAndSaveSettingFile();
206 206
207 // Try to save the interfaces settings. 207 // Try to save the interfaces settings.
208 if(!interfaceSetup->saveChanges()) 208 if(!interfaceSetup->saveChanges())
209 return; 209 return;
210 210
211 QDialog::accept();
212 return;
213 // Restart the device now that the settings have changed 211 // Restart the device now that the settings have changed
214 QString initpath; 212 QString initpath;
215 if( QDir("/etc/rc.d/init.d").exists() ) 213 if( QDir("/etc/rc.d/init.d").exists() )
216 initpath = "/etc/rc.d/init.d"; 214 initpath = "/etc/rc.d/init.d";
217 else if( QDir("/etc/init.d").exists() ) 215 else if( QDir("/etc/init.d").exists() )
218 initpath = "/etc/init.d"; 216 initpath = "/etc/init.d";