Merge branch 'ebf201903251154' of cwtch.im/cwtch into master

This commit is contained in:
Dan Ballard 2019-03-25 13:03:12 -07:00 gecommit door Gogs
bovenliggende 94664d5604 5ece75b3a8
commit 3671d91287
1 gewijzigde bestanden met toevoegingen van 2 en 5 verwijderingen

Bestand weergeven

@ -54,13 +54,10 @@ func (ss *streamStore) initBuffer() {
func (ss *streamStore) initBufferFromStorage() error {
filename := fmt.Sprintf("%s.%d", ss.filenameBase, 0)
bytes, err := readEncryptedFile(ss.storeDirectory, filename, ss.password)
if err != nil {
log.Debugf("Failed to read encrypted file: %v", err)
}
bytes, _ := readEncryptedFile(ss.storeDirectory, filename, ss.password)
msgs := []model.Message{}
err = json.Unmarshal([]byte(bytes), &msgs)
err := json.Unmarshal([]byte(bytes), &msgs)
if err != nil {
log.Debugf("failed to init buffer from storage: %v", err)
return err