summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ipn/ipnlocal/local.go1
-rw-r--r--ipn/ipnlocal/state_test.go5
2 files changed, 2 insertions, 4 deletions
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 877978729..3000eb8e0 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -714,6 +714,7 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
b.send(ipn.Notify{
State: &state,
NetMap: nm,
+ Prefs: b.prefs,
LoginFinished: new(empty.Message),
})
return nil
diff --git a/ipn/ipnlocal/state_test.go b/ipn/ipnlocal/state_test.go
index 0630eb6e9..7fef0c166 100644
--- a/ipn/ipnlocal/state_test.go
+++ b/ipn/ipnlocal/state_test.go
@@ -550,10 +550,7 @@ func TestStateMachine(t *testing.T) {
c.Assert(nn[0].State, qt.Not(qt.IsNil))
c.Assert(nn[0].LoginFinished, qt.Not(qt.IsNil))
c.Assert(nn[0].NetMap, qt.Not(qt.IsNil))
- // BUG: Prefs should be sent too, or the UI could end up in
- // a bad state. (iOS, the only current user of this feature,
- // probably wouldn't notice because it happens to not display
- // any prefs. Maybe exit nodes will look weird?)
+ c.Assert(nn[0].Prefs, qt.Not(qt.IsNil))
}
// undo the state hack above.