From 90694195612e677156f0e3b83679d8f97c9e35c0 Mon Sep 17 00:00:00 2001 From: Mendel Greenberg Date: Fri, 5 Nov 2021 16:05:05 -0400 Subject: [PATCH] fix: hide form cancel button to prevent crash when clicking before starting server --- gui.go | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gui.go b/gui.go index 68f5caf..37d8689 100644 --- a/gui.go +++ b/gui.go @@ -56,18 +56,7 @@ func gui() { CancelText: "Stop Server", } - form.OnCancel = func() { - infoLabel.Text = "Stopping Server" - serverStop() - infoLabel.Text = "Server Stopped" - form.SubmitText = "Start Server" - oscOutput.Enable() - oscInput.Enable() - oscAddr.Enable() - httpPortField.Enable() - form.Refresh() - runtime.GC() - } + form.OnCancel = nil form.OnSubmit = func() { clipPath = path.Text OSCOutPort = oscOutput.Text @@ -94,6 +83,23 @@ func gui() { oscInput.Disable() oscAddr.Disable() httpPortField.Disable() + + form.OnCancel = func() { + infoLabel.Text = "Stopping Server" + serverStop() + infoLabel.Text = "Server Stopped" + form.SubmitText = "Start Server" + oscOutput.Enable() + oscInput.Enable() + oscAddr.Enable() + httpPortField.Enable() + + form.OnCancel = nil + + form.Refresh() + runtime.GC() + } + form.Refresh() runtime.GC() }