[Pkg-owncloud-commits] [owncloud-client] 27/70: Fix crash when _engine is not available

[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 091e9bbd52f34e5a0a3eb94b80854fd3944da8e6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed May 7 16:17:08 2014 +0200

    Fix crash when _engine is not available
    
    Fixes #1671 and #1675
---
 src/mirall/folder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 227880c..ef93494 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -301,7 +301,7 @@ void Folder::bubbleUpSyncResult()
 
     SyncRunFileLog syncFileLog;
 
-    syncFileLog.start(path(),  _engine->stopWatch() );
+    syncFileLog.start(path(), _engine ? _engine->stopWatch() : Utility::StopWatch() );
 
     QElapsedTimer timer;
     timer.start();

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