fix: hide form cancel button to prevent crash when clicking before st…

…arting server
chabad360 · Nov 5, 2021 · 9069419 · 9069419
1 parent b7cbba1
commit 9069419
Showing 1 changed file with 18 additions and 12 deletions.
diff --git 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()
 	}