accounts: fix account deletion navigation

Change-Id: I8655b2a5840c81b20b5827cc685790016e648245

accounts: fix account deletion navigation
Change-Id: I8655b2a5840c81b20b5827cc685790016e648245
10523bf3 · Andreas Traczyk · a3b984f0 · 10523bf3 · 10523bf3
Commit 10523bf3 authored Dec 31, 2018 by Andreas Traczyk
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

currentaccountcombobox.cpp currentaccountcombobox.cpp +4 -1

settingswidget.cpp settingswidget.cpp +3 -1

No files found.
--- a/currentaccountcombobox.cpp
+++ b/currentaccountcombobox.cpp
@@ -230,5 +230,8 @@ CurrentAccountComboBox::leaveEvent(QEvent* event)
 void
 CurrentAccountComboBox::updateComboBoxDisplay()
 {
-    importLabelPhoto(LRCInstance::getCurrentAccountIndex());
+    auto currAccIndex = LRCInstance::getCurrentAccountIndex();
+    if (currAccIndex != currentIndex())
+        setCurrentIndex(currAccIndex);
+    importLabelPhoto(currAccIndex);
 }
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -502,9 +502,11 @@ SettingsWidget::delAccountSlot()
    DeleteAccountDialog delDialog(this);
    delDialog.exec();

+    LRCInstance::setSelectedAccountId("");
    if (!LRCInstance::accountModel().getAccountList().size()) {
-        LRCInstance::setSelectedAccountId("");
        emit NavigationRequested(ScreenEnum::WizardScreen);
+    } else {
+        emit NavigationRequested(ScreenEnum::CallScreen);
    }
 }