[Pkg-owncloud-commits] [owncloud-client] 176/218: Application: Fix crash on early shutdown #3898

[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 d0c2ce276a0bde6abf748cf42150000477ed5275
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Sep 30 11:40:33 2015 +0200

    Application: Fix crash on early shutdown #3898
---
 src/gui/application.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 3e5148a..e5bf787 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -190,7 +190,9 @@ Application::~Application()
 {
     // Make sure all folders are gone, otherwise removing the
     // accounts will remove the associated folders from the settings.
-    FolderMan::instance()->unloadAndDeleteAllFolders();
+    if (_folderManager) {
+        _folderManager->unloadAndDeleteAllFolders();
+    }
 
     // Remove the account from the account manager so it can be deleted.
     AccountManager::instance()->shutdown();

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