diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 51cf84d17..4231f260f 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -857,9 +857,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); @@ -2973,12 +2970,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 234f661a6..6429c1c7c 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -41,7 +41,6 @@ #endif #include #include -#include #include #include #include @@ -610,8 +609,6 @@ namespace BitTorrent QNetworkConfigurationManager m_networkManager; - mutable QReadWriteLock m_lock; - static Session *m_instance; }; }