Skip to content

Commit

Permalink
git-gui: suppress RenderBadPicture X error caused by Tk bug
Browse files Browse the repository at this point in the history
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 <makovick@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Jindrich Makovicka authored and Shawn O. Pearce committed Dec 7, 2009
1 parent 1085208 commit 60204dd
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2052,6 +2052,11 @@ proc do_quit {{rc {1}}} {
}
set ret_code $rc
# Briefly enable send again, working around Tk bug
# http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
tk appname [appname]
destroy .
}
Expand Down

0 comments on commit 60204dd

Please sign in to comment.