diff --git a/currentaccountcombobox.cpp b/currentaccountcombobox.cpp index 31031c8f6309eafe4b1a5a24d608fb83b085accf..2b47ddb978a67a3842666986df8e7a5a5ae80fa8 100644 --- 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); } diff --git a/settingswidget.cpp b/settingswidget.cpp index 579c277fd79a45c9ab02b40b55e04911193e0d90..b085ae453226e98b7f1d5aeb391fd8d4ff4d5f1e 100644 --- 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); } }