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

Fix warning about serverJob not being used

Browse source 
And fix a FIXME in the same time
This commit is contained in:
Olivier Goffart 2019-10-07 10:49:23 +02:00 committed by Kevin Ottens
parent 89216daee6
commit adbd3d869b
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libsync/discovery.cpp
View file

@ -36,9 +36,8 @@ void ProcessDirectoryJob::start()
{ {
qCInfo(lcDisco) << "STARTING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal; qCInfo(lcDisco) << "STARTING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal;
DiscoverySingleDirectoryJob *serverJob = nullptr;
if (_queryServer == NormalQuery) { if (_queryServer == NormalQuery) {
serverJob = startAsyncServerQuery(); _serverJob = startAsyncServerQuery();
} else { } else {
_serverQueryDone = true; _serverQueryDone = true;
} }
@ -57,8 +56,6 @@ void ProcessDirectoryJob::start()
_localQueryDone = true; _localQueryDone = true;
} }
// FIXME: serverJob->abort() if local failed..? This used to be in code before
if (_localQueryDone && _serverQueryDone) { if (_localQueryDone && _serverQueryDone) {
process(); process();
} }
@ -1448,6 +1445,8 @@ void ProcessDirectoryJob::startAsyncLocalQuery()
connect(localJob, &DiscoverySingleLocalDirectoryJob::finishedFatalError, this, [this](const QString &msg) { connect(localJob, &DiscoverySingleLocalDirectoryJob::finishedFatalError, this, [this](const QString &msg) {
_discoveryData->_currentlyActiveJobs--; _discoveryData->_currentlyActiveJobs--;
_pendingAsyncJobs--; _pendingAsyncJobs--;
if (_serverJob)
_serverJob->abort();
emit _discoveryData->fatalError(msg); emit _discoveryData->fatalError(msg);
}); });