diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-29 15:52:17 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-29 15:52:17 +0200 |
| commit | 3245ef2f821fee0580f7d97c6f05223c2673e318 (patch) | |
| tree | a37424f17b611c6d5d04da9fceb4a756dadf52ab /ui/managewindow.go | |
| parent | ui: account for IPC failures in UI initialization (diff) | |
| download | wireguard-windows-3245ef2f821fee0580f7d97c6f05223c2673e318.tar.xz wireguard-windows-3245ef2f821fee0580f7d97c6f05223c2673e318.zip | |
service: pass global state with notification
Diffstat (limited to 'ui/managewindow.go')
| -rw-r--r-- | ui/managewindow.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ui/managewindow.go b/ui/managewindow.go index 626b5efb..b3e0c832 100644 --- a/ui/managewindow.go +++ b/ui/managewindow.go @@ -76,7 +76,8 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) { disposables.Spare() mtw.tunnelChangedCB = service.IPCClientRegisterTunnelChange(mtw.onTunnelChange) - mtw.onTunnelChange(nil, service.TunnelUnknown, nil) + globalState, _ := service.IPCClientGlobalState() + mtw.onTunnelChange(nil, service.TunnelUnknown, globalState, nil) return mtw, nil } @@ -89,14 +90,11 @@ func (mtw *ManageTunnelsWindow) Dispose() { mtw.MainWindow.Dispose() } -func (mtw *ManageTunnelsWindow) onTunnelChange(tunnel *service.Tunnel, state service.TunnelState, err error) { - globalState, err2 := service.IPCClientGlobalState() +func (mtw *ManageTunnelsWindow) onTunnelChange(tunnel *service.Tunnel, state service.TunnelState, globalState service.TunnelState, err error) { mtw.Synchronize(func() { + icon, err2 := iconProvider.IconWithOverlayForState(globalState) if err2 == nil { - icon, err2 := iconProvider.IconWithOverlayForState(globalState) - if err2 == nil { - mtw.SetIcon(icon) - } + mtw.SetIcon(icon) } if err != nil && mtw.Visible() { |