From 1451888845a2a48398e55868920e102c74d33c4e Mon Sep 17 00:00:00 2001 From: Nicolas Jager <nicolas.jager@savoirfairelinux.com> Date: Tue, 18 Apr 2017 10:57:19 -0400 Subject: [PATCH] use selectionModel() in currentDefaultAccount() - swap AccountModel for AvailableAccountModel to get the chosen user account. Change-Id: I63e5199de2b1df8a2c486fe383f32475153ddacb Reviewed-by: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> --- src/availableaccountmodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/availableaccountmodel.cpp b/src/availableaccountmodel.cpp index 41caf1d2..c8d43749 100644 --- a/src/availableaccountmodel.cpp +++ b/src/availableaccountmodel.cpp @@ -132,7 +132,8 @@ bool AvailableAccountModel::validAccountForScheme(Account* account, URI::SchemeT Account* AvailableAccountModel::currentDefaultAccount(URI::SchemeType schemeType) { // Always try to respect user choice - auto userChosenAccount = AccountModel::instance().userChosenAccount(); + const auto idx = AvailableAccountModel::instance().selectionModel()->currentIndex(); + auto userChosenAccount = idx.data(static_cast<int>(Account::Role::Object)).value<Account*>(); if (userChosenAccount && validAccountForScheme(userChosenAccount, schemeType)) { return userChosenAccount; } -- GitLab