Merge pull request 'fix storage pretending to load stores it does not have a password for' (#301) from dan/cwtch:fixStorage into master
This commit is contained in:
commit
f952fbc680
|
@ -97,10 +97,13 @@ func LoadProfileWriterStore(eventManager event.Manager, directory, password stri
|
||||||
ps := &ProfileStoreV1{fs: NewFileStore(directory, profileFilename, key), key: key, directory: directory, profile: nil, eventManager: eventManager, streamStores: map[string]StreamStore{}, writer: true}
|
ps := &ProfileStoreV1{fs: NewFileStore(directory, profileFilename, key), key: key, directory: directory, profile: nil, eventManager: eventManager, streamStores: map[string]StreamStore{}, writer: true}
|
||||||
copy(ps.salt[:], salt)
|
copy(ps.salt[:], salt)
|
||||||
|
|
||||||
|
|
||||||
|
err = ps.load()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
ps.initProfileWriterStore()
|
ps.initProfileWriterStore()
|
||||||
|
|
||||||
ps.load()
|
|
||||||
|
|
||||||
return ps, nil
|
return ps, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue