octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-31 14:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/nat: Don't hang on draining timer chan (fixes #6908) (#6912)

Browse Source
This commit is contained in:
Simon Frei 2020-08-19 16:58:44 +02:00 committed by GitHub
parent cbbc262161
commit ce4d149bf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nat/service.go
View File

@ -85,7 +85,10 @@ func (s *Service) serve(ctx context.Context) {
case <-timer.C:
case <-s.processScheduled:
if !timer.Stop() {
<-timer.C
select {
case <-timer.C:
default:
}
}
case <-ctx.Done():
timer.Stop()