summaryrefslogtreecommitdiffhomepage
path: root/control/controlclient
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@tailscale.com>2021-04-30 06:08:26 -0400
committerAvery Pennarun <apenwarr@tailscale.com>2021-04-30 09:18:13 -0400
commit0181a4d0ac46152917476e58c9df8d25c14cbb54 (patch)
treeb18a93397ea6703f12d1761706a5f4e206e0aa7b /control/controlclient
parent4ef207833b556ec6f01fc8670ab3f5f9f4c4c1c6 (diff)
downloadtailscale-apenwarr/statefix.tar.xz
tailscale-apenwarr/statefix.zip
ipnlocal: don't pause the controlclient until we get at least one netmap.apenwarr/statefix
Without this, macOS would fail to display its menu state correctly if you started it while !WantRunning. It relies on the netmap in order to show the logged-in username. Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
Diffstat (limited to 'control/controlclient')
-rw-r--r--control/controlclient/auto.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go
index 077b6ad38..fd1823fa9 100644
--- a/control/controlclient/auto.go
+++ b/control/controlclient/auto.go
@@ -129,6 +129,7 @@ func (c *Auto) SetPaused(paused bool) {
if paused == c.paused {
return
}
+ c.logf("setPaused(%v)", paused)
c.paused = paused
if paused {
// Only cancel the map routine. (The auth routine isn't expensive
@@ -267,7 +268,7 @@ func (c *Auto) authRoutine() {
if goal != nil {
c.logf("authRoutine: %s; wantLoggedIn=%v", c.state, goal.wantLoggedIn)
} else {
- c.logf("authRoutine: %s; goal=nil", c.state)
+ c.logf("authRoutine: %s; goal=nil paused=%v", c.state, c.paused)
}
c.mu.Unlock()