- ui.accountView->setCurrentIndex(model()->index(0, 0));
- ui.accountView->selectionModel()->select(model()->index(0, 0), QItemSelectionModel::Select);
+
+ CoreAccountSettings s;
+
+ if(Quassel::runMode() != Quassel::Monolithic) {
+ // make sure we don't have selected the internal account as autoconnect account
+
+ if(s.autoConnectOnStartup() && s.autoConnectToFixedAccount()) {
+ CoreAccount acc = model()->account(s.autoConnectAccount());
+ if(acc.isInternal())
+ ui.autoConnectOnStartup->setChecked(false);
+ }
+ }
+ ui.accountView->setCurrentIndex(filteredModel()->index(0, 0));
+ ui.accountView->selectionModel()->select(filteredModel()->index(0, 0), QItemSelectionModel::Select);
+
+ QModelIndex idx = filteredModel()->mapFromSource(model()->accountIndex(s.autoConnectAccount()));
+ ui.autoConnectAccount->setCurrentIndex(idx.isValid() ? idx.row() : 0);
+ ui.autoConnectAccount->setProperty("storedValue", ui.autoConnectAccount->currentIndex());