author | andyq <andyq> | 2002-11-10 15:34:59 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-10 15:34:59 (UTC) |
commit | 6d3fd69b7f14971d837e4fd13084bb978592a752 (patch) (unidiff) | |
tree | 9c11d7be738bc147215af59654c9ab1f51ddcf10 | |
parent | 804e08f4642353af836bab921d8f732709051de0 (diff) | |
download | opie-6d3fd69b7f14971d837e4fd13084bb978592a752.zip opie-6d3fd69b7f14971d837e4fd13084bb978592a752.tar.gz opie-6d3fd69b7f14971d837e4fd13084bb978592a752.tar.bz2 |
Added braces round key checking if statement to fix bug that WEP settings
were never saved if WEP was enabled
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index d4b4af9..e64a633 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp | |||
@@ -197,16 +197,19 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Check to see if the current config is valid | 199 | * Check to see if the current config is valid |
200 | * Save wireless.opts, save interfaces | 200 | * Save wireless.opts, save interfaces |
201 | */ | 201 | */ |
202 | void WLANImp::accept(){ | 202 | void WLANImp::accept(){ |
203 | printf( "Accept pressed\n" ); | ||
203 | if(wepEnabled->isChecked()){ | 204 | if(wepEnabled->isChecked()){ |
204 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) | 205 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) |
205 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); | 206 | { |
206 | return; | 207 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); |
208 | return; | ||
209 | } | ||
207 | } | 210 | } |
208 | 211 | ||
209 | // Ok settings are good here, save | 212 | // Ok settings are good here, save |
210 | changeAndSaveSettingFile(); | 213 | changeAndSaveSettingFile(); |
211 | 214 | ||
212 | // Try to save the interfaces settings. | 215 | // Try to save the interfaces settings. |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index d4b4af9..e64a633 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -197,16 +197,19 @@ void WLANImp::changeAndSaveSettingFile(){ | |||
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Check to see if the current config is valid | 199 | * Check to see if the current config is valid |
200 | * Save wireless.opts, save interfaces | 200 | * Save wireless.opts, save interfaces |
201 | */ | 201 | */ |
202 | void WLANImp::accept(){ | 202 | void WLANImp::accept(){ |
203 | printf( "Accept pressed\n" ); | ||
203 | if(wepEnabled->isChecked()){ | 204 | if(wepEnabled->isChecked()){ |
204 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) | 205 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) |
205 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); | 206 | { |
206 | return; | 207 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); |
208 | return; | ||
209 | } | ||
207 | } | 210 | } |
208 | 211 | ||
209 | // Ok settings are good here, save | 212 | // Ok settings are good here, save |
210 | changeAndSaveSettingFile(); | 213 | changeAndSaveSettingFile(); |
211 | 214 | ||
212 | // Try to save the interfaces settings. | 215 | // Try to save the interfaces settings. |