summaryrefslogtreecommitdiffstats
path: root/ds9/library
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-07-06 17:46:14 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-07-06 17:46:14 (GMT)
commit983aee499d7c4d7ec048af3451d26418c54609cf (patch)
treeb8fd2127e87ae941daabcbf441dc9845854e191a /ds9/library
parent87857e76bf675acea8d37da8bf938557168d0dbe (diff)
downloadblt-983aee499d7c4d7ec048af3451d26418c54609cf.zip
blt-983aee499d7c4d7ec048af3451d26418c54609cf.tar.gz
blt-983aee499d7c4d7ec048af3451d26418c54609cf.tar.bz2
fix xpa startup switch
Diffstat (limited to 'ds9/library')
-rw-r--r--ds9/library/ds9.tcl4
-rw-r--r--ds9/library/xpa.tcl4
2 files changed, 3 insertions, 5 deletions
diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index ab778c1..072131b 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -574,7 +574,9 @@ ConfigHTTP
InitSAMP
# XPA
-InitXPA
+if {$pds9(xpa)} {
+ InitXPA
+}
# and process any command line items
# we want to see something before any fits files are loaded
diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl
index 30a237b..32cf316 100644
--- a/ds9/library/xpa.tcl
+++ b/ds9/library/xpa.tcl
@@ -9,10 +9,6 @@ proc InitXPA {} {
global pds9
global env
- if {!$pds9(xpa)} {
- return
- }
-
# this is needed
# if there is a problem (usually with VPN), XPA will hang
# so preempt and set to local before XPAINIT