From 9a1157fd6bb107d1255c5bcc784e8217511fcdd7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 6 Oct 2016 23:51:45 +0200
Subject: [PATCH] Use current config in applyAndReconnect()

---
 tray/gui/settingsdialog.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tray/gui/settingsdialog.cpp b/tray/gui/settingsdialog.cpp
index db22b9d..b74f81e 100644
--- a/tray/gui/settingsdialog.cpp
+++ b/tray/gui/settingsdialog.cpp
@@ -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