mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-21 08:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10438 from Chocobo1/timer

Browse Source 
Work around the crash occurred in QTimer
This commit is contained in:
Mike Tzou 2019-04-09 13:53:48 +08:00 committed by GitHub
commit 460b73ebda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/webui/api/synccontroller.cpp
View File

@ -31,8 +31,8 @@
#include <algorithm> #include <algorithm>
#include <QJsonObject> #include <QJsonObject>
#include <QMetaObject>
#include <QThread> #include <QThread>
#include <QTimer>
#include "base/bittorrent/peerinfo.h" #include "base/bittorrent/peerinfo.h"
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
@ -335,7 +335,7 @@ SyncController::SyncController(ISessionManager *sessionManager, QObject *parent)
connect(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::checked, this, &SyncController::freeDiskSpaceSizeUpdated); connect(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::checked, this, &SyncController::freeDiskSpaceSizeUpdated);
m_freeDiskSpaceThread->start(); m_freeDiskSpaceThread->start();
QTimer::singleShot(0, m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check); invokeChecker();
m_freeDiskSpaceElapsedTimer.start(); m_freeDiskSpaceElapsedTimer.start();
} }
@ -521,7 +521,7 @@ void SyncController::torrentPeersAction()
qint64 SyncController::getFreeDiskSpace() qint64 SyncController::getFreeDiskSpace()
{ {
if (m_freeDiskSpaceElapsedTimer.hasExpired(FREEDISKSPACE_CHECK_TIMEOUT)) { if (m_freeDiskSpaceElapsedTimer.hasExpired(FREEDISKSPACE_CHECK_TIMEOUT)) {
QTimer::singleShot(0, m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check); invokeChecker();
m_freeDiskSpaceElapsedTimer.restart(); m_freeDiskSpaceElapsedTimer.restart();
} }
@ -532,3 +532,12 @@ void SyncController::freeDiskSpaceSizeUpdated(qint64 freeSpaceSize)
{ {
m_freeDiskSpace = freeSpaceSize; m_freeDiskSpace = freeSpaceSize;
} }
void SyncController::invokeChecker() const
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
QMetaObject::invokeMethod(m_freeDiskSpaceChecker, &FreeDiskSpaceChecker::check, Qt::QueuedConnection);
#else
QMetaObject::invokeMethod(m_freeDiskSpaceChecker, "check", Qt::QueuedConnection);
#endif
}

1
src/webui/api/synccontroller.h
View File

@ -56,6 +56,7 @@ private slots:
private: private:
qint64 getFreeDiskSpace(); qint64 getFreeDiskSpace();
void invokeChecker() const;
qint64 m_freeDiskSpace = 0; qint64 m_freeDiskSpace = 0;
FreeDiskSpaceChecker *m_freeDiskSpaceChecker = nullptr; FreeDiskSpaceChecker *m_freeDiskSpaceChecker = nullptr;