[Pkg-owncloud-commits] [owncloud-client] 179/219: Folderman: Check if socketApi member is non zero, no crashes.

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:24 UTC 2014


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 479b340d75a44e84bbccd289b0e56e660a66faac
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Sep 30 12:33:51 2014 +0200

    Folderman: Check if socketApi member is non zero, no crashes.
---
 src/mirall/folderman.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 2df22cc..6e7ad73 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -452,7 +452,9 @@ void FolderMan::slotScheduleSync( const QString& alias )
             f->prepareToSync();
         } else {
             qDebug() << "Folder is not enabled, not scheduled!";
-            _socketApi->slotUpdateFolderView(f->alias());
+            if( _socketApi ) {
+                _socketApi->slotUpdateFolderView(f->alias());
+            }
             return;
         }
         _scheduleQueue.enqueue(alias);
@@ -514,8 +516,10 @@ void FolderMan::slotStartScheduledFolderSync()
 
             // reread the excludes of the socket api
             // FIXME: the excludes need rework.
-            _socketApi->slotClearExcludesList();
-            _socketApi->slotReadExcludes();
+            if( _socketApi ) {
+                _socketApi->slotClearExcludesList();
+                _socketApi->slotReadExcludes();
+            }
         }
     }
 }

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



More information about the Pkg-owncloud-commits mailing list