mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not dereference the _engine member variable without check."

Browse Source 
bubbleUpSyncResult is only called from slotSyncFinished, so if _engine
is invalid there, it is also invalid in slotSyncFinished

This reverts commit aee7515d42.
This commit is contained in:
Olivier Goffart 2014-05-07 16:13:43 +02:00
parent d7a226e0e6
commit ce09e11011
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mirall/folder.cpp
View File

@ -301,8 +301,7 @@ void Folder::bubbleUpSyncResult()
SyncRunFileLog syncFileLog;
syncFileLog.start(path(), _stopWatch );
_stopWatch.reset();
syncFileLog.start(path(), _engine->stopWatch() );
QElapsedTimer timer;
timer.start();
@ -630,7 +629,6 @@ void Folder::slotSyncFinished()
qDebug() << "-> CSync Finished slot with error " << _csyncError << "warn count" << _syncResult.warnCount();
bubbleUpSyncResult();
_stopWatch = _engine->stopWatch();
_engine.reset(0);
// _watcher->setEventsEnabledDelayed(2000);

4
src/mirall/folder.h
View File

@ -21,7 +21,6 @@
#include "mirall/progressdispatcher.h"
#include "mirall/syncjournaldb.h"
#include "mirall/clientproxy.h"
#include "mirall/utility.h"
#include <csync.h>
@ -187,6 +186,7 @@ private slots:
private:
bool init();
void setIgnoredFiles();
void bubbleUpSyncResult();
@ -217,8 +217,6 @@ private:
ClientProxy _clientProxy;
Utility::StopWatch _stopWatch;
CSYNC *_csync_ctx;
};