mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 15:05:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

bandwidthmanager: Fix unregistering devices on delete

Browse source 
from the destroyed signal, qobject_cast won't work because the object
is already destroyed. One must use reinterpret_cast then
This commit is contained in:
Olivier Goffart 2017-09-25 11:55:18 +02:00 committed by Roeland Jago Douma
parent 37810c0a19
commit fd9662b803
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libsync/bandwidthmanager.cpp
View file

@ -95,7 +95,7 @@ void BandwidthManager::registerUploadDevice(UploadDevice *p)
{ {
_absoluteUploadDeviceList.append(p); _absoluteUploadDeviceList.append(p);
_relativeUploadDeviceList.append(p); _relativeUploadDeviceList.append(p);
QObject::connect(p, SIGNAL(destroyed(QObject *)), this, SLOT(unregisterUploadDevice(QObject *))); QObject::connect(p, &QObject::destroyed, this, &BandwidthManager::unregisterUploadDevice);
if (usingAbsoluteUploadLimit()) { if (usingAbsoluteUploadLimit()) {
p->setBandwidthLimited(true); p->setBandwidthLimited(true);
@ -111,14 +111,7 @@ void BandwidthManager::registerUploadDevice(UploadDevice *p)
void BandwidthManager::unregisterUploadDevice(QObject *o) void BandwidthManager::unregisterUploadDevice(QObject *o)
{ {
UploadDevice *p = qobject_cast<UploadDevice *>(o); auto p = reinterpret_cast<UploadDevice *>(o); // note, we might already be in the ~QObject
if (p) {
unregisterUploadDevice(p);
}
}
void BandwidthManager::unregisterUploadDevice(UploadDevice *p)
{
_absoluteUploadDeviceList.removeAll(p); _absoluteUploadDeviceList.removeAll(p);
_relativeUploadDeviceList.removeAll(p); _relativeUploadDeviceList.removeAll(p);
if (p == _relativeLimitCurrentMeasuredDevice) { if (p == _relativeLimitCurrentMeasuredDevice) {
@ -130,7 +123,7 @@ void BandwidthManager::unregisterUploadDevice(UploadDevice *p)
void BandwidthManager::registerDownloadJob(GETFileJob *j) void BandwidthManager::registerDownloadJob(GETFileJob *j)
{ {
_downloadJobList.append(j); _downloadJobList.append(j);
QObject::connect(j, SIGNAL(destroyed(QObject *)), this, SLOT(unregisterDownloadJob(QObject *))); QObject::connect(j, &QObject::destroyed, this, &BandwidthManager::unregisterDownloadJob);
if (usingAbsoluteDownloadLimit()) { if (usingAbsoluteDownloadLimit()) {
j->setBandwidthLimited(true); j->setBandwidthLimited(true);
@ -144,8 +137,9 @@ void BandwidthManager::registerDownloadJob(GETFileJob *j)
} }
} }
void BandwidthManager::unregisterDownloadJob(GETFileJob *j) void BandwidthManager::unregisterDownloadJob(QObject *o)
{ {
GETFileJob *j = reinterpret_cast<GETFileJob *>(o); // note, we might already be in the ~QObject
_downloadJobList.removeAll(j); _downloadJobList.removeAll(j);
if (_relativeLimitCurrentMeasuredJob == j) { if (_relativeLimitCurrentMeasuredJob == j) {
_relativeLimitCurrentMeasuredJob = 0; _relativeLimitCurrentMeasuredJob = 0;
@ -153,14 +147,6 @@ void BandwidthManager::unregisterDownloadJob(GETFileJob *j)
} }
} }
void BandwidthManager::unregisterDownloadJob(QObject *o)
{
GETFileJob *p = qobject_cast<GETFileJob *>(o);
if (p) {
unregisterDownloadJob(p);
}
}
void BandwidthManager::relativeUploadMeasuringTimerExpired() void BandwidthManager::relativeUploadMeasuringTimerExpired()
{ {
if (!usingRelativeUploadLimit() || _relativeUploadDeviceList.count() == 0) { if (!usingRelativeUploadLimit() || _relativeUploadDeviceList.count() == 0) {

2
src/libsync/bandwidthmanager.h
View file

@ -45,11 +45,9 @@ public:
public slots: public slots:
void registerUploadDevice(UploadDevice *); void registerUploadDevice(UploadDevice *);
void unregisterUploadDevice(UploadDevice *);
void unregisterUploadDevice(QObject *); void unregisterUploadDevice(QObject *);
void registerDownloadJob(GETFileJob *); void registerDownloadJob(GETFileJob *);
void unregisterDownloadJob(GETFileJob *);
void unregisterDownloadJob(QObject *); void unregisterDownloadJob(QObject *);
void absoluteLimitTimerExpired(); void absoluteLimitTimerExpired();