commit 39fa4d0b3348695c6245a8e66e0431b7186cd7bc
author Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Thu Jan 03 17:32:07 2019 -0500
committer Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Thu Jan 03 17:32:07 2019 -0500
tree fef9738c8beffaab3db3472053f8a7c62693a263
parent 39414a01ae5919f85e19a5087f0c521236c2dd28

ui: handle navigation between calls/settings better

Change-Id: Ib621e160a8563b65c0967a0bf12d5d32663c8826

settingswidget.cpp

diff --git a/settingswidget.cpp b/settingswidget.cpp
index 2a149c2..e8016b1 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -500,13 +500,15 @@
 SettingsWidget::delAccountSlot()
 {
     DeleteAccountDialog delDialog(this);
-    delDialog.exec();
-
-    LRCInstance::setSelectedAccountId("");
-    if (!LRCInstance::accountModel().getAccountList().size()) {
-        emit NavigationRequested(ScreenEnum::WizardScreen);
-    } else {
-        emit NavigationRequested(ScreenEnum::CallScreen);
+    auto ret = delDialog.exec();
+    if (ret == QDialog::Accepted) {
+        LRCInstance::setSelectedAccountId("");
+        if (!LRCInstance::accountModel().getAccountList().size()) {
+            emit NavigationRequested(ScreenEnum::WizardScreen);
+        } else {
+            LRCInstance::setSelectedConvId("");
+            emit NavigationRequested(ScreenEnum::CallScreen);
+        }
     }
 }