[Pkg-owncloud-commits] [owncloud-client] 39/121: Fix a crash on if shutting down during propagation

[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 6f3aaecb783c5d8b9dc82cb9752ec4d0372a3b9c
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Jun 17 19:04:24 2016 +0200

    Fix a crash on if shutting down during propagation
    
    The SyncRunFileLog owned by the Folder must be destroyed after the
    SyncEngine since the SyncEngine will abort during destruction, resulting
    in all jobs being aborted.
    
    It's possible that this crash only happens with a debug build.
---
 src/gui/folder.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 0a88c68..ac50c7f 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -121,6 +121,8 @@ Folder::Folder(const FolderDefinition& definition,
 
 Folder::~Folder()
 {
+    // Reset then engine first as it will abort and try to access members of the Folder
+    _engine.reset();
 }
 
 void Folder::checkLocalPath()

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