From 43a5be1c4b14f62aaffdaa9c88432fc60b6dc439 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 26 Mar 2019 21:31:33 +0100 Subject: [PATCH] lib/model: Send item finished even after deregistering (fixes #5362) (#5620) --- lib/model/folder_sendrecv.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go index 86774eb29..9becd62a4 100644 --- a/lib/model/folder_sendrecv.go +++ b/lib/model/folder_sendrecv.go @@ -1568,6 +1568,10 @@ func (f *sendReceiveFolder) finisherRoutine(in <-chan *sharedPullerState, dbUpda blockStatsMut.Unlock() } + if f.model.progressEmitter != nil { + f.model.progressEmitter.Deregister(state) + } + events.Default.Log(events.ItemFinished, map[string]interface{}{ "folder": f.folderID, "item": state.file.Name, @@ -1575,10 +1579,6 @@ func (f *sendReceiveFolder) finisherRoutine(in <-chan *sharedPullerState, dbUpda "type": "file", "action": "update", }) - - if f.model.progressEmitter != nil { - f.model.progressEmitter.Deregister(state) - } } } }