lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 0fd6bf0a1c into ffaa6be8a4

pull/8346/merge
James Tucker 2023-07-08 20:13:27 -07:00 committed by GitHub
parent ffaa6be8a4 0fd6bf0a1c
commit 05aa537950
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
wgengine/magicsock/magicsock.go
View File

@ -4438,7 +4438,10 @@ func (de *endpoint) heartbeat() {
de.mu.Lock()
defer de.mu.Unlock()
de.heartBeatTimer = nil
if de.heartBeatTimer != nil {
de.heartBeatTimer.Stop()
de.heartBeatTimer = nil
}
if de.heartbeatDisabled {
// If control override to disable heartBeatTimer set, return early.