Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index 16926fa..28e13b0 100644 (file)
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -81,8 +81,7 @@ void SelectRemoteDlg::alphabetItemChanged(QListWidgetItem *current,
 {
     mfgList->clear();
     modelList->removeAllRows();
-    if (current)
-    {
+    if (current) {
         mfgList->addItems((*remoteDB)[current->text()].keys());
     }
 }
@@ -91,8 +90,7 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
                                      QListWidgetItem * /*previous*/)
 {
     modelList->removeAllRows();
-    if (current)
-    {
+    if (current) {
         RemoteList remotes =
             (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
         foreach(Remote *remote, remotes) {
@@ -104,8 +102,8 @@ void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
 void SelectRemoteDlg::downloadRemote()
 {
     Remote *currentModel = modelList->selected();
-    if (currentModel)
-    {
+    if (currentModel) {
+        setResult(QDialog::Accepted);
         setBusy();
         connect(currentModel, SIGNAL(saveFinished()),
                 this, SLOT(close()));

diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp
index 42ec42b..e9b9b11 100644 (file)
--- a/src/settingsdlg.cpp
+++ b/src/settingsdlg.cpp
@@ -121,7 +121,9 @@ void SettingsDlg::showSelectRemoteDlg()
     SelectRemoteDlg dlg;
     connect(&dlg, SIGNAL(remoteChanged(Remote)),
             this, SLOT(setRemote(Remote)));
-    dlg.exec();
+    if (dlg.exec() == QDialog::Rejected) {
+        onNetworkStatusUpdate();
+    }
 }
 
 void SettingsDlg::showAboutDlg()