diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
| commit | 0290564d5c654d654856f04f1b04bad984f36aee (patch) | |
| tree | 3b9a5eda39861d9467bc130a00e7effbc4ef7b6c /src/libsync/progressdispatcher.cpp | |
| parent | 638f5c8752164ccc0429b1df60b79c3d3293bcd4 (diff) | |
| parent | 3a335879fa1f00f094d82855126fec3f6ab59405 (diff) | |
Merge remote-tracking branch 'owncloud/master' into delta-sync
Conflicts:
.gitmodules
src/cmd/cmd.cpp
src/gui/generalsettings.ui
src/libsync/propagatedownload.cpp
src/libsync/propagateuploadng.cpp
Diffstat (limited to 'src/libsync/progressdispatcher.cpp')
| -rw-r--r-- | src/libsync/progressdispatcher.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index 204b7dc49..dcdf841c3 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -139,7 +139,8 @@ void ProgressInfo::reset() _status = Starting; _currentItems.clear(); - _currentDiscoveredFolder.clear(); + _currentDiscoveredRemoteFolder.clear(); + _currentDiscoveredLocalFolder.clear(); _sizeProgress = Progress(); _fileProgress = Progress(); _totalSizeOfCompletedJobs = 0; |