diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-10-17 17:24:25 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-10-17 17:24:25 (GMT) |
commit | 499d228444970179b790227345477a4992f7b2bc (patch) | |
tree | 9fb8604ef457b1ebfeb93202784b264c7c5fd22b /ds9/library/catmatch.tcl | |
parent | 6dc29e2c5fe4ef4ecefb098e81db9ea0f21e9712 (diff) | |
download | blt-499d228444970179b790227345477a4992f7b2bc.zip blt-499d228444970179b790227345477a4992f7b2bc.tar.gz blt-499d228444970179b790227345477a4992f7b2bc.tar.bz2 |
Catalog: match sometimes failed to find proper catalogs
Diffstat (limited to 'ds9/library/catmatch.tcl')
-rw-r--r-- | ds9/library/catmatch.tcl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ds9/library/catmatch.tcl b/ds9/library/catmatch.tcl index 8382a48..ed63d78 100644 --- a/ds9/library/catmatch.tcl +++ b/ds9/library/catmatch.tcl @@ -228,14 +228,26 @@ proc CATMatch {frame varname1 varname2} { puts stderr "CATMatch $frame $varname1 $varname2" } + if {$varname1 == {} || $varname2 == {}} { + return + } + upvar #0 $varname1 var1 global $varname1 + if {![info exists var1(tbldb)]} { + # error + return + } global $var1(tbldb) set t1 $var1(tbldb) upvar #0 $t1 T1 upvar #0 $varname2 var2 global $varname2 + if {![info exists var2(tbldb)]} { + # error + return + } global $var2(tbldb) set t2 $var2(tbldb) upvar #0 $t2 T2 |