diff options
| author | Jindrich Makovicka <makovick@gmail.com> | 2009-12-04 10:28:44 +0100 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-12-07 07:39:58 -0800 |
| commit | 60204ddb99187dd329000864a618e57742372d74 (patch) | |
| tree | e40ea6fed570e08be2acf01d827b0560430d257a | |
| parent | 10852086d4dceee924000ef70388b00704f7b463 (diff) | |
| download | git-60204ddb99187dd329000864a618e57742372d74.tar.gz git-60204ddb99187dd329000864a618e57742372d74.tar.xz | |
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 <makovick@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | git-gui.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 037a1f2c2..718277a65 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -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 . } |