github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix activity timer on timeout = 0

pull/1132/head
Darien Raymond 2018-05-28 13:55:20 +02:00
parent 9321210bcf
commit 6dbe2644a9
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/signal/timer.go
View File

@ -44,7 +44,7 @@ func (t *ActivityTimer) finish() {
t.onTimeout() t.onTimeout()
} }
if t.checkTask != nil { if t.checkTask != nil {
t.checkTask.Close() t.checkTask.Close() // nolint: errcheck
t.checkTask = nil t.checkTask = nil
} }
} }
@ -52,6 +52,7 @@ func (t *ActivityTimer) finish() {
func (t *ActivityTimer) SetTimeout(timeout time.Duration) { func (t *ActivityTimer) SetTimeout(timeout time.Duration) {
if timeout == 0 { if timeout == 0 {
t.finish() t.finish()
return
} }
t.Lock() t.Lock()