Skip to content

Commit 60204dd

Browse files
jmakovickaspearce
authored andcommitted
git-gui: suppress RenderBadPicture X error caused by Tk bug
Due to a bug in Tk, git-gui almost always (unless git-gui is closed right after starting) produces an X window error message on exit, something like: X Error of failed request: RenderBadPicture (invalid Picture parameter) Major opcode of failed request: 150 (RENDER) Minor opcode of failed request: 7 (RenderFreePicture) Picture id in failed request: 0x3a000dc Serial number of failed request: 1965 Current serial number in output stream: 1980 Respective Tk bug report is here: http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 This bug is triggered only when the send command is blocked via rename send {} . The following patch re-enables send just before quiting git-gui to suppress the error. Signed-off-by: Jindrich Makovicka <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent 1085208 commit 60204dd

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

git-gui.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,11 @@ proc do_quit {{rc {1}}} {
20522052
}
20532053
20542054
set ret_code $rc
2055+
2056+
# Briefly enable send again, working around Tk bug
2057+
# http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2058+
tk appname [appname]
2059+
20552060
destroy .
20562061
}
20572062

0 commit comments

Comments
 (0)