Index reset should generate file conflicts (fixes #1613)

2015-04-09 12:53:41 +02:00
parent f45865606a
commit 936c76119d
6 changed files with 60 additions and 8 deletions
--- a/internal/model/model.go
+++ b/internal/model/model.go
@@ -142,7 +142,7 @@ func (m *Model) StartFolderRW(folder string) {
 	if ok {
 		panic("cannot start already running folder " + folder)
 	}
-	p := newRWFolder(m, cfg)
+	p := newRWFolder(m, m.shortID, cfg)
 	m.folderRunners[folder] = p
 	m.fmut.Unlock()