aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui/managewindow.go
diff options
context:
space:
mode:
authorAlexander Neumann <an2048@gmail.com>2019-07-25 15:12:04 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-07-29 09:45:07 +0200
commit0dce279a896c604054f835ac921faa20af26b610 (patch)
treeb267dbf46cd412aa6f13b7d87ca7a586aed08d84 /ui/managewindow.go
parentui: use now exposed ItemCountChanged event (diff)
downloadwireguard-windows-0dce279a896c604054f835ac921faa20af26b610.tar.xz
wireguard-windows-0dce279a896c604054f835ac921faa20af26b610.zip
ui: improve error handling
Signed-off-by: Alexander Neumann <an2048@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/managewindow.go')
-rw-r--r--ui/managewindow.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/ui/managewindow.go b/ui/managewindow.go
index 7c643aba..60664abb 100644
--- a/ui/managewindow.go
+++ b/ui/managewindow.go
@@ -40,6 +40,8 @@ func init() {
func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
var err error
+ var disposables walk.Disposables
+ defer disposables.Treat()
font, err := walk.NewFont("Segoe UI", 9, 0)
if err != nil {
@@ -53,6 +55,7 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
if err != nil {
return nil, err
}
+ disposables.Add(mtw)
win.ChangeWindowMessageFilterEx(mtw.Handle(), raiseMsg, win.MSGFLT_ALLOW, nil)
mtw.SetPersistent(true)
@@ -60,7 +63,6 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
mtw.SetIcon(icon)
}
mtw.SetTitle("WireGuard")
- mtw.AddDisposable(font)
mtw.SetFont(font)
mtw.SetSize(walk.Size{670, 525})
mtw.SetMinMaxSize(walk.Size{500, 400}, walk.Size{0, 0})
@@ -85,7 +87,9 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
}
})
- mtw.tabs, _ = walk.NewTabWidget(mtw)
+ if mtw.tabs, err = walk.NewTabWidget(mtw); err != nil {
+ return nil, err
+ }
if mtw.tunnelsPage, err = NewTunnelsPage(); err != nil {
return nil, err
@@ -118,6 +122,8 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
})
}
+ disposables.Spare()
+
return mtw, nil
}
@@ -157,7 +163,7 @@ func (mtw *ManageTunnelsWindow) onTunnelChange(tunnel *manager.Tunnel, state man
if len(errMsg) > 0 && errMsg[len(errMsg)-1] != '.' {
errMsg += "."
}
- walk.MsgBox(mtw, "Tunnel Error", errMsg+"\n\nPlease consult the log for more information.", walk.MsgBoxIconWarning)
+ showWarningCustom(mtw, "Tunnel Error", errMsg+"\n\nPlease consult the log for more information.")
}
})
}