From 48e487776b1440cb34fb6da2664ed2b364a624a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Tue, 5 Nov 2019 12:13:45 -0500
Subject: [PATCH] upnp: only create upnpController if account is active

Change-Id: I4bef4ef4db759caa805dd14bc7f4fe0107e7839b
---
 src/account.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/account.cpp b/src/account.cpp
index bcbcdbff8a..de4bc1682e 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -267,7 +267,7 @@ Account::unserialize(const YAML::Node& node)
 
     bool enabled;
     parseValue(node, UPNP_ENABLED_KEY, enabled);
-    enableUpnp(enabled);
+    enableUpnp(enabled && isEnabled());
 }
 
 void
@@ -294,7 +294,7 @@ Account::setAccountDetails(const std::map<std::string, std::string> &details)
         userAgent_ = DEFAULT_USER_AGENT;
     bool enabled;
     parseBool(details, Conf::CONFIG_UPNP_ENABLED, enabled);
-    enableUpnp(enabled);
+    enableUpnp(enabled && isEnabled());
 }
 
 std::map<std::string, std::string>
-- 
GitLab