From ca443f18ef7b32d085813fd910eedbe8369f5e68 Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Fri, 6 May 2022 10:44:25 -0400 Subject: [PATCH] added panic check for gui + entry text reset --- netclient/gui/components/views/join.go | 1 + netclient/gui/gui.go | 5 +++++ netclient/main_gui.go | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/netclient/gui/components/views/join.go b/netclient/gui/components/views/join.go index 30958e7b..f5b7f4e1 100644 --- a/netclient/gui/components/views/join.go +++ b/netclient/gui/components/views/join.go @@ -43,6 +43,7 @@ func GetJoinView() fyne.CanvasObject { return } SuccessNotify("Joined " + cfg.Network + "!") + input.Text = "" RefreshComponent(Networks, GetNetworksView(networks)) ShowView(Networks) // TODO diff --git a/netclient/gui/gui.go b/netclient/gui/gui.go index b9269d8f..7bd8c285 100644 --- a/netclient/gui/gui.go +++ b/netclient/gui/gui.go @@ -96,6 +96,11 @@ func Run(networks []string) error { views.CurrentContent.Add(views.GetView(views.Join)) window.SetContent(views.CurrentContent) + defer func() { + if r := recover(); r != nil { + logger.Log(0, "No monitor detected, please use CLI commands; use -help for more info.") + } + }() window.ShowAndRun() return nil } diff --git a/netclient/main_gui.go b/netclient/main_gui.go index 678361d5..a5db7868 100644 --- a/netclient/main_gui.go +++ b/netclient/main_gui.go @@ -1,7 +1,6 @@ //go:build gui // +build gui -//go:generate goversioninfo -icon=windowsdata/resource/netmaker.ico -manifest=netclient.exe.manifest.xml -64=true -o=netclient.syso package main import (