mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Guard the flag used for deferred session configure." (#6733)

Browse source 
This reverts commit 5cbc7b16c0.
This commit is contained in:
Vladimir Golovnev 2017-05-02 14:39:47 +03:00 committed by sledgehammer999
parent cee308a517
commit b6e1b6e501
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/base/bittorrent/session.cpp
View file

@ -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

3
src/base/bittorrent/session.h
View file

@ -41,7 +41,6 @@
#endif
#include <QNetworkConfigurationManager>
#include <QPointer>
#include <QReadWriteLock>
#include <QStringList>
#include <QVector>
#include <QWaitCondition>
@ -610,8 +609,6 @@ namespace BitTorrent
QNetworkConfigurationManager m_networkManager;
mutable QReadWriteLock m_lock;
static Session *m_instance;
};
}