Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use current config in applyAndReconnect()

This commit is contained in:
Martchus 2016-10-06 23:51:45 +02:00
parent ef5fd1cb9c
commit 9a1157fd6b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tray/gui/settingsdialog.cpp
View File

@ -51,7 +51,6 @@ ConnectionOptionPage::~ConnectionOptionPage()
QWidget *ConnectionOptionPage::setupWidget()
{
auto *w = ConnectionOptionPageBase::setupWidget();
updateConnectionStatus();
ui()->certPathSelection->provideCustomFileMode(QFileDialog::ExistingFile);
ui()->certPathSelection->lineEdit()->setPlaceholderText(QCoreApplication::translate("QtGui::ConnectionOptionPage", "Auto-detected for local instance"));
QObject::connect(m_connection, &SyncthingConnection::statusChanged, bind(&ConnectionOptionPage::updateConnectionStatus, this));
@ -210,13 +209,15 @@ void ConnectionOptionPage::reset()
ui()->selectionComboBox->clear();
ui()->selectionComboBox->addItems(itemTexts);
ui()->selectionComboBox->setCurrentIndex(0);
updateConnectionStatus();
}
}
void ConnectionOptionPage::applyAndReconnect()
{
apply();
m_connection->reconnect(primaryConnectionSettings());
m_connection->reconnect((m_currentIndex == 0 ? m_primarySettings : m_secondarySettings[static_cast<size_t>(m_currentIndex - 1)]));
}
// NotificationsOptionPage