diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-06-19 16:44:39 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-06-19 16:44:39 (GMT) |
| commit | 52ee5fdf867c8acda580c26b230459feb89652ec (patch) | |
| tree | d5676876b4f88881508021aecfb6a8a33e8d9e45 | |
| parent | 8b5b3fe3a51503a7d8cff1b2eab3bc6faddbc2a4 (diff) | |
| parent | 4dd3200a3579f0a819c8e560acfedbb83fd64592 (diff) | |
| download | blt-52ee5fdf867c8acda580c26b230459feb89652ec.zip blt-52ee5fdf867c8acda580c26b230459feb89652ec.tar.gz blt-52ee5fdf867c8acda580c26b230459feb89652ec.tar.bz2 | |
Merge branch 'master' into devel
| -rw-r--r-- | ds9/doc/release/r8.1.html | 1 | ||||
| -rw-r--r-- | tksao/frame/framergbload.C | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html index 1eeb36a..28f5806 100644 --- a/ds9/doc/release/r8.1.html +++ b/ds9/doc/release/r8.1.html @@ -82,6 +82,7 @@ <li><tt>05.28.2019 URL: more tolerant of mime types when downloading via http.</tt></li> <li><tt>06.04.2019 COLORBAR: fixed a number of issues with updating the screen with color tags active.</tt></li> <li><tt>06.05.2019 GUI: colobar cmds load/save errors now report via Error proc.</tt></li> +<li><tt>06.19.2019 RGB: fixed an issue introduced in 8.1b1 in which a bad fits file loaded into RGB frame would not generate an error message.</tt></li> <li><tt><b>xx.xx.2019 RELEASE version 8.1b2</b></tt></li> </ol> </div> diff --git a/tksao/frame/framergbload.C b/tksao/frame/framergbload.C index 98fbfae..bf71402 100644 --- a/tksao/frame/framergbload.C +++ b/tksao/frame/framergbload.C @@ -389,8 +389,7 @@ void FrameRGB::loadDone(int rr) keyContext = currentContext; keyContextSet =1; } - - Base::loadDone(rr); } + Base::loadDone(rr); } |