From ab326b7898fe5230ac7f7fb8196e40fe5751090c Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 4 May 2017 17:05:16 -0400
Subject: fix minor https issue

---
 ds9/library/prefs.tcl | 24 ++++++++++++++++++------
 ds9/library/url.tcl   |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl
index 71a5529..7229720 100644
--- a/ds9/library/prefs.tcl
+++ b/ds9/library/prefs.tcl
@@ -394,6 +394,18 @@ proc FixVar {varname ovarname} {
     }
 }
 
+proc FixVarSet {varname ovarname} {
+    global aa bb
+    set aa $varname
+    set bb $ovarname
+
+    uplevel #0 {
+	if {[info exists $bb]} {
+	    set $aa [expr $$bb]
+	}
+    }
+}
+
 proc FixVarRm {ovarname} {
     global aa
     set aa $ovarname
@@ -758,12 +770,12 @@ proc FixPrefs6.0to6.1 {} {
     FixVar pnres(server) nres(server)
 
     # graph
-    FixVar pgraph(horz,grid) graph(horz,grid) 
-    FixVar pgraph(horz,log) graph(horz,log) 
-    FixVar pgraph(vert,grid) graph(vert,grid) 
-    FixVar pgraph(vert,log) graph(vert,log) 
-    global graph
-    catch {unset graph}
+    FixVarSet pgraph(horz,grid) graph(horz,grid) 
+    FixVarSet pgraph(horz,log) graph(horz,log) 
+    FixVarSet pgraph(vert,grid) graph(vert,grid) 
+    FixVarSet pgraph(vert,log) graph(vert,log) 
+#    global graph
+#    catch {unset graph}
 
     # cat
     FixVar pcat(server) cat(server)
diff --git a/ds9/library/url.tcl b/ds9/library/url.tcl
index 1535aa1..224dc93 100644
--- a/ds9/library/url.tcl
+++ b/ds9/library/url.tcl
@@ -14,7 +14,7 @@ proc GetFileURL {url fname} {
     switch -- $rr(scheme) {
 	ftp {GetFileFTP $rr(authority) $rr(path) $fn}
 	file {set fn $rr(path)}
-	http
+	http -
 	https -
 	default {GetFileHTTP $url $fn}
     }
-- 
cgit v0.12