From f283e9371939cac0df3c5f0bcaf0356c73a1c7a8 Mon Sep 17 00:00:00 2001 From: pztrn Date: Sun, 9 Oct 2016 13:23:59 +0500 Subject: [PATCH] One more possible fix. --- launcher/launcher_object.go | 3 --- ui/options_profile.go | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/launcher/launcher_object.go b/launcher/launcher_object.go index dc65f9f..b64c8f2 100644 --- a/launcher/launcher_object.go +++ b/launcher/launcher_object.go @@ -70,9 +70,6 @@ func (l *Launcher) Launch(server_profile *datamodels.Server, user_profile *datam if err != nil { fmt.Println(err.Error()) } - if runtime.GOOS == "darwin" { - launch_bin = launch_bin + "/Contents/MacOS/Quake3-UrT.x86_64" - } server_address := server_profile.Ip + ":" + server_profile.Port diff --git a/ui/options_profile.go b/ui/options_profile.go index 0a9548c..46156cc 100644 --- a/ui/options_profile.go +++ b/ui/options_profile.go @@ -81,9 +81,9 @@ func (op *OptionsProfile) browseForBinaryHelper() { } } else if runtime.GOOS == "darwin" { // No separate arch thing here, macOS now 64bit only. - if len(filename) > 0 && strings.Split(filename, ".")[1] != "app" && strings.Split(filename, ".")[0] != "Quake3-UrT" { + if len(filename) > 0 && strings.Split(filename, ".")[1] != "x86_64" && strings.Split(filename, ".")[0] != "Quake3-UrT" { fmt.Println("Invalid binary selected!") - mbox_string := "Invalid binary selected!\nAccording to your OS, it should be Quake3-UrT.app." + mbox_string := "Invalid binary selected!\nAccording to your OS, it should be Quake3-UrT.app/Contents/MacOS/Quake3-UrT.x86_64." m := gtk.NewMessageDialog(op.window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, mbox_string) m.Response(func() { m.Destroy()