From 55a4fd752d1b3f4ef8fde00f5d74fd0a0d8aac63 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 20 Feb 2013 17:26:07 +0100 Subject: [PATCH] Fix commit fd83bf - add treewalk success check. --- src/mirall/csyncthread.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 43c55d2ffc..16c252daa8 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -388,10 +388,12 @@ void CSyncThread::startSync() return; } + bool walkOk = true; if( csync_walk_local_tree(csync, &treewalkLocal, 0) < 0 ) { qDebug() << "Error in local treewalk."; + walkOk = false; } - if( csync_walk_remote_tree(csync, &treewalkRemote, 0) < 0 ) { + if( walkOk && csync_walk_remote_tree(csync, &treewalkRemote, 0) < 0 ) { qDebug() << "Error in remote treewalk."; } @@ -403,12 +405,14 @@ void CSyncThread::startSync() return; } - if( csync_walk_local_tree(csync, &walkFinalize, 0) < 0 || + if( walkOk ) { + if( csync_walk_local_tree(csync, &walkFinalize, 0) < 0 || csync_walk_remote_tree( csync, &walkFinalize, 0 ) < 0 ) { - qDebug() << "Error in finalize treewalk."; - } else { + qDebug() << "Error in finalize treewalk."; + } else { // emit the treewalk results. - emit treeWalkResult(_syncedItems); + emit treeWalkResult(_syncedItems); + } } }