From c1e3e2a745f554ca5162bedc32f6395ebe6e3108 Mon Sep 17 00:00:00 2001
From: Vladimir Golovnev <glassez@yandex.ru>
Date: Tue, 2 May 2017 14:39:47 +0300
Subject: [PATCH] Revert "Guard the flag used for deferred session configure."
 (#6733)

This reverts commit 5cbc7b16c04331599f382fa71bdc73f4aed476c7.
---
 src/base/bittorrent/session.cpp | 13 ++++---------
 src/base/bittorrent/session.h   |  3 ---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index 8a2c162a2..9c08c15ae 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -873,9 +873,6 @@ void Session::adjustLimits()
 void Session::configure()
 {
     qDebug("Configuring session");
-    if (!m_deferredConfigureScheduled) return; // Obtaining the lock is expensive, let's check early
-    QWriteLocker locker(&m_lock);
-    if (!m_deferredConfigureScheduled) return; // something might have changed while we were getting the lock
 #if LIBTORRENT_VERSION_NUM < 10100
     libt::session_settings sessionSettings = m_nativeSession->settings();
     configure(sessionSettings);
@@ -3029,12 +3026,10 @@ void Session::initResumeFolder()
 
 void Session::configureDeferred()
 {
-    if (m_deferredConfigureScheduled) return; // Obtaining the lock is expensive, let's check early
-    QWriteLocker locker(&m_lock);
-    if (m_deferredConfigureScheduled) return; // something might have changed while we were getting the lock
-
-    QMetaObject::invokeMethod(this, "configure", Qt::QueuedConnection);
-    m_deferredConfigureScheduled = true;
+    if (!m_deferredConfigureScheduled) {
+        QMetaObject::invokeMethod(this, "configure", Qt::QueuedConnection);
+        m_deferredConfigureScheduled = true;
+    }
 }
 
 // Enable IP Filtering
diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h
index 59aa2828b..dc7d6cfcd 100644
--- a/src/base/bittorrent/session.h
+++ b/src/base/bittorrent/session.h
@@ -41,7 +41,6 @@
 #endif
 #include <QNetworkConfigurationManager>
 #include <QPointer>
-#include <QReadWriteLock>
 #include <QStringList>
 #include <QVector>
 #include <QWaitCondition>
@@ -603,8 +602,6 @@ namespace BitTorrent
 
         QNetworkConfigurationManager m_networkManager;
 
-        mutable QReadWriteLock m_lock;
-
         static Session *m_instance;
     };
 }