diff options
Diffstat (limited to 'ui/tunnelspage.go')
| -rw-r--r-- | ui/tunnelspage.go | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index 469ecdeb..5df74d05 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -265,17 +265,25 @@ func (tp *TunnelsPage) deleteTunnel(tunnel *service.Tunnel) { // Handlers func (tp *TunnelsPage) onTunnelsViewItemActivated() { - oldState, err := tp.tunnelsView.CurrentTunnel().Toggle() - if err != nil { - if oldState == service.TunnelUnknown { - walk.MsgBox(tp.Form(), "Failed to determine tunnel state", err.Error(), walk.MsgBoxIconError) - } else if oldState == service.TunnelStopped { - walk.MsgBox(tp.Form(), "Failed to activate tunnel", err.Error(), walk.MsgBoxIconError) - } else if oldState == service.TunnelStarted { - walk.MsgBox(tp.Form(), "Failed to deactivate tunnel", err.Error(), walk.MsgBoxIconError) + go func() { + globalState, err := service.IPCClientGlobalState() + if err != nil || (globalState != service.TunnelStarted && globalState != service.TunnelStopped) { + return } - return - } + oldState, err := tp.tunnelsView.CurrentTunnel().Toggle() + if err != nil { + tp.Synchronize(func() { + if oldState == service.TunnelUnknown { + walk.MsgBox(tp.Form(), "Failed to determine tunnel state", err.Error(), walk.MsgBoxIconError) + } else if oldState == service.TunnelStopped { + walk.MsgBox(tp.Form(), "Failed to activate tunnel", err.Error(), walk.MsgBoxIconError) + } else if oldState == service.TunnelStarted { + walk.MsgBox(tp.Form(), "Failed to deactivate tunnel", err.Error(), walk.MsgBoxIconError) + } + }) + return + } + }() } func (tp *TunnelsPage) onEditTunnel() { |