Skip to content

Commit ead1687

Browse files
committed
Merge branch 'es/ignore-osascript-failure'
* es/ignore-osascript-failure: gitk: fix MacOS 10.14 "Mojave" crash on launch
2 parents d7cedce + 9611ef5 commit ead1687

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

gitk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12462,11 +12462,13 @@ namespace import ::msgcat::mc
1246212462
1246312463
# on OSX bring the current Wish process window to front
1246412464
if {[tk windowingsystem] eq "aqua"} {
12465-
safe_exec [list osascript -e [format {
12466-
tell application "System Events"
12467-
set frontmost of processes whose unix id is %d to true
12468-
end tell
12469-
} [pid] ]]
12465+
catch {
12466+
safe_exec [list osascript -e [format {
12467+
tell application "System Events"
12468+
set frontmost of processes whose unix id is %d to true
12469+
end tell
12470+
} [pid] ]]
12471+
}
1247012472
}
1247112473
1247212474
# Unset GIT_TRACE var if set

0 commit comments

Comments
 (0)