Merge branch 'es/ignore-osascript-failure'

* es/ignore-osascript-failure:
  gitk: fix MacOS 10.14 "Mojave" crash on launch

1 files changed, 7 insertions, 5 deletions

diff --git a/gitk b/gitk
index 3cfc9ef291..a35c091cf1 100755
--- a/gitk
+++ b/gitk
@@ -12462,11 +12462,13 @@ namespace import ::msgcat::mc
 
 # on OSX bring the current Wish process window to front
 if {[tk windowingsystem] eq "aqua"} {
-    safe_exec [list osascript -e [format {
-        tell application "System Events"
-            set frontmost of processes whose unix id is %d to true
-        end tell
-    } [pid] ]]
+    catch {
+        safe_exec [list osascript -e [format {
+            tell application "System Events"
+                set frontmost of processes whose unix id is %d to true
+            end tell
+        } [pid] ]]
+    }
 }
 
 # Unset GIT_TRACE var if set