only check astInv() for wcs

5 files changed, 16 insertions, 18 deletions

diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html
index 5e1022c..38d95a3 100644
--- a/ds9/doc/release/r8.0.html
+++ b/ds9/doc/release/r8.0.html
@@ -23,7 +23,7 @@
         <li><tt>06.15.2018 IIS: fixed a problem introduced in version 7.6 with the colormap.</tt></li>
         <li><tt>06.15.2018 IIS: fixed a problem the values displayed on the colorbar.</tt></li>
         <li><tt>06.22.2018 API: All new parser/lexer for each command, backward compatible API. Parser will detect syntax errors, and suggest legal options.</tt></li>
-        <li><tt>06.22.2018 CAT: updated catalog menu items for GAIA, UCAC, and SDSS.</tt></li>
+        <li><tt>06.22.2018 CATALOG: updated catalog menu items for GAIA, UCAC, and SDSS.</tt></li>
         <li><tt>06.25.2018 REGIONS: added support for compressed regions files.</tt></li>
         <li><tt><b>xx.xx.2018 RELEASE version 8.0b1</b></tt></li>
       </ol>
diff --git a/ds9/library/grid.tcl b/ds9/library/grid.tcl
index b527812..63f82f0 100644
--- a/ds9/library/grid.tcl
+++ b/ds9/library/grid.tcl
@@ -971,7 +971,6 @@ proc UpdateGridDialog {} {
 		}
 	    }
 
-	    set grid(frame) $current(frame)
 	    if {[$current(frame) has fits]} {
 		CoordMenuEnable $igrid(mb).coord grid system 1 sky skyformat
 	    } else {
diff --git a/tksao/frame/grid25d.C b/tksao/frame/grid25d.C
index 3268eba..fbf0f28 100644
--- a/tksao/frame/grid25d.C
+++ b/tksao/frame/grid25d.C
@@ -36,11 +36,6 @@ int Grid25d::doit(RenderMode rm)
   if (!fits)
     return 1;
 
-#ifdef NEWWCS
-  if (!fits->astInv())
-    return 1;
-#endif
-
   astClearStatus; // just to make sure
   astBegin; // start memory management
 
@@ -62,12 +57,16 @@ int Grid25d::doit(RenderMode rm)
     break;
   default:
     {
-
       // set desired skyformat
 #ifndef NEWWCS
       AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
       fits->setWCSSkyFrame(ast, sky_);
 #else
+      if (!fits->astInv()) {
+	astEnd; // now, clean up memory
+	return 1;
+      }
+
       fits->setWCSSkyFrame(system_, sky_);
       AstFrameSet* ast = fits->wcsCopy();
 
diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
index 26c89d6..f89917f 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
@@ -36,11 +36,6 @@ int Grid2d::doit(RenderMode rm)
   if (!fits)
     return 1;
 
-#ifdef NEWWCS
-  if (!fits->astInv())
-    return 1;
-#endif
-  
   astClearStatus; // just to make sure
   astBegin; // start memory management
 
@@ -68,6 +63,11 @@ int Grid2d::doit(RenderMode rm)
       AstFrameSet* ast = (AstFrameSet*)astCopy(fits->getAST(system_));
       fits->setWCSSkyFrame(ast, sky_);
 #else
+      if (!fits->astInv()) {
+	astEnd; // now, clean up memory
+	return 1;
+      }
+
       fits->setWCSSkyFrame(system_, sky_);
       AstFrameSet* ast = fits->wcsCopy();
       
diff --git a/tksao/frame/grid3d.C b/tksao/frame/grid3d.C
index 72342c8..8db3f09 100644
--- a/tksao/frame/grid3d.C
+++ b/tksao/frame/grid3d.C
@@ -66,11 +66,6 @@ int Grid3d::doit(RenderMode rm)
   if (!fits)
     return 1;
 
-#ifdef NEWWCS
-  if (!fits->astInv())
-    return 1;
-#endif
-
   astClearStatus; // just to make sure
   astBegin; // start memory management
 
@@ -113,6 +108,11 @@ int Grid3d::doit(RenderMode rm)
       ast = astFrameSet(cmpwcsbase,"");
       astAddFrame(ast, AST__CURRENT, cmpwcsmap, cmpwcscurr);
 #else
+      if (!fits->astInv()) {
+	astEnd; // now, clean up memory
+	return 1;
+      }
+
       fits->setWCSSkyFrame(system_, sky_);
       AstFrameSet* ast = fits->wcsCopy();