From 7988107926bd2091f4d9f9fb48f5926154e7a664 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 8 Apr 2019 16:03:34 +0200 Subject: ui: initialize TunnelsView model from service.IPCClientTunnels Signed-off-by: Alexander Neumann Signed-off-by: Jason A. Donenfeld --- ui/tunnelsview.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'ui/tunnelsview.go') diff --git a/ui/tunnelsview.go b/ui/tunnelsview.go index 08bc1f21..faad2383 100644 --- a/ui/tunnelsview.go +++ b/ui/tunnelsview.go @@ -71,7 +71,10 @@ func NewTunnelsView(parent walk.Container) (*TunnelsView, error) { } disposables.Add(tv) - model := &TunnelModel{} + model := new(TunnelModel) + if model.tunnels, err = service.IPCClientTunnels(); err != nil { + return nil, err + } tv.SetModel(model) tv.SetLastColumnStretched(true) @@ -133,18 +136,7 @@ func (tv *TunnelsView) SetTunnelState(tunnel *service.Tunnel, state service.Tunn } if idx != -1 { - // we don't do anything with the state right now + tv.model.PublishRowChanged(idx) return } - - // New tunnel, add it - tv.model.tunnels = append(tv.model.tunnels, *tunnel) - tv.model.Sort(0, walk.SortAscending) - for i, _ := range tv.model.tunnels { - if tv.model.tunnels[i].Name == tunnel.Name { - idx = i - } - } - - tv.model.PublishRowsInserted(idx, idx) } -- cgit v1.2.3-59-g8ed1b