afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(Boeing r1782)

Browse source 
support tcl/tk8.6 when available
fix channel read error upon shutdown with tcl8.6
This commit is contained in:
ahrenholz 2013-10-09 19:57:45 +00:00
parent f28e80ab66
commit c85429ba8b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gui/api.tcl
View file

@ -75,7 +75,11 @@ proc receiveMessage { channel } {
# read first four bytes of message header # read first four bytes of message header
set more_data 1 set more_data 1
while { $more_data == 1 } { while { $more_data == 1 } {
set bytes [read $channel 4] if { [catch { set bytes [read $channel 4] } e] } {
# in tcl8.6 this occurs during shutdown
#puts "channel closed: $e"
break;
}
if { [fblocked $channel] == 1} { if { [fblocked $channel] == 1} {
# 4 bytes not available yet # 4 bytes not available yet
break; break;

2
gui/core-gui.in
View file

@ -92,7 +92,7 @@ cd $LIBDIR
core=$LIBDIR/core.tcl core=$LIBDIR/core.tcl
# locate wish8.5 binaries # locate wish8.5 binaries
WISHLIST="/usr/local/bin/wish8.5 /usr/bin/wish8.5" WISHLIST="/usr/bin/wish8.6 /usr/local/bin/wish8.5 /usr/bin/wish8.5"
for wishbin in $WISHLIST for wishbin in $WISHLIST
do do
if [ -x $wishbin ] if [ -x $wishbin ]