From 7bf06cd6e61e53fc59d3bdad8ecee328e00923c3 Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Mon, 31 Oct 2016 01:32:08 +0200
Subject: [PATCH] Fix save/load of interface address setting.

---
 src/base/preferences.cpp     | 10 ----------
 src/base/preferences.h       |  2 --
 src/base/settingsstorage.cpp |  1 +
 src/gui/advancedsettings.cpp |  6 +++---
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 40c83f9c3..f89333149 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -711,16 +711,6 @@ void Preferences::setNetworkInterfaceName(const QString& iface)
     setValue("Preferences/Connection/InterfaceName", iface);
 }
 
-void Preferences::setNetworkInterfaceAddress(const QString& addr)
-{
-    setValue("Preferences/Connection/InterfaceAddress", addr);
-}
-
-QString Preferences::getNetworkInterfaceAddress() const
-{
-    return value("Preferences/Connection/InterfaceAddress").toString();
-}
-
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
 bool Preferences::useSystemIconTheme() const
 {
diff --git a/src/base/preferences.h b/src/base/preferences.h
index 72e06b0b4..18bd1a1b6 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -228,8 +228,6 @@ public:
     void resolvePeerHostNames(bool resolve);
     QString getNetworkInterfaceName() const;
     void setNetworkInterfaceName(const QString& iface);
-    QString getNetworkInterfaceAddress() const;
-    void setNetworkInterfaceAddress(const QString& addr);
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
     bool useSystemIconTheme() const;
     void useSystemIconTheme(bool enabled);
diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp
index a896e5084..df97a6c3a 100644
--- a/src/base/settingsstorage.cpp
+++ b/src/base/settingsstorage.cpp
@@ -118,6 +118,7 @@ namespace
             {"BitTorrent/Session/UseRandomPort", "Preferences/General/UseRandomPort"},
             {"BitTorrent/Session/IPv6Enabled", "Preferences/Connection/InterfaceListenIPv6"},
             {"BitTorrent/Session/Interface", "Preferences/Connection/Interface"},
+            {"BitTorrent/Session/InterfaceAddress", "Preferences/Connection/InterfaceAddress"},
             {"BitTorrent/Session/SaveResumeDataInterval", "Preferences/Downloads/SaveResumeDataInterval"},
             {"BitTorrent/Session/Encryption", "Preferences/Bittorrent/Encryption"},
             {"BitTorrent/Session/ForceProxy", "Preferences/Connection/ProxyForce"},
diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index 1af7807f3..c1182c9fc 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -156,11 +156,11 @@ void AdvancedSettings::saveAdvancedSettings()
     // Interface address
     if (combo_iface_address.currentIndex() == 0) {
         // All addresses (default)
-        pref->setNetworkInterfaceAddress(QString::null);
+        session->setNetworkInterfaceAddress(QString::null);
     }
     else {
         QHostAddress ifaceAddr(combo_iface_address.currentText().trimmed());
-        ifaceAddr.isNull() ? pref->setNetworkInterfaceAddress(QString::null) : pref->setNetworkInterfaceAddress(ifaceAddr.toString());
+        ifaceAddr.isNull() ? session->setNetworkInterfaceAddress(QString::null) : session->setNetworkInterfaceAddress(ifaceAddr.toString());
     }
     session->setIPv6Enabled(cb_listen_ipv6.isChecked());
     // Announce IP
@@ -200,7 +200,7 @@ void AdvancedSettings::updateInterfaceAddressCombo()
 {
     // Try to get the currently selected interface name
     const QString ifaceName = combo_iface.itemData(combo_iface.currentIndex()).toString(); // Empty string for the first element
-    const QString currentAddress = Preferences::instance()->getNetworkInterfaceAddress();
+    const QString currentAddress = BitTorrent::Session::instance()->networkInterfaceAddress();
 
     //Clear all items and reinsert them, default to all
     combo_iface_address.clear();