[Pkg-owncloud-commits] [owncloud-client] 26/70: Revert "Do not dereference the _engine member variable without check."

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ce09e110113c4156488d8cb87f98ecd6ab9b2c2c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed May 7 16:13:43 2014 +0200

    Revert "Do not dereference the _engine member variable without check."
    
    bubbleUpSyncResult is only called from slotSyncFinished, so if _engine
    is invalid there, it is also invalid in slotSyncFinished
    
    This reverts commit aee7515d42650fb91b0b5de5c9af9d0839b1509e.
---
 src/mirall/folder.cpp | 4 +---
 src/mirall/folder.h   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index fae0a0e..227880c 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -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);
diff --git a/src/mirall/folder.h b/src/mirall/folder.h
index f648182..1918225 100644
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -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;
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git