lib/model: Fix regression deleting directories on pull (ref #5690) (#5691)

2019-05-06 20:55:26 +02:00 · 2019-05-06 20:55:26 +02:00 · b45d77b6be
parent 79e67b7f79
commit b45d77b6be
1 changed files with 3 additions and 1 deletions
--- a/lib/model/folder_sendrecv.go
+++ b/lib/model/folder_sendrecv.go
@ -513,13 +513,15 @@ func (f *sendReceiveFolder) processDeletions(fileDeletions map[string]protocol.F
 		}
 	}

-	for _, dir := range dirDeletions {
+	// Process in reverse order to delete depth first
+	for i := range dirDeletions {
 		select {
 		case <-f.ctx.Done():
 			return
 		default:
 		}

+		dir := dirDeletions[len(dirDeletions)-i-1]
 		f.resetPullError(dir.Name)
 		l.Debugln(f, "Deleting dir", dir.Name)
 		f.deleteDir(dir, dbUpdateChan, scanChan)