diff --git a/CHANGELOG.md b/CHANGELOG.md index 69aca1ab47cfb622d764e64854a9a267ca24fa69..ce6c03c170c06f740f3ef914b508dbfda2323e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,6 +70,7 @@ release. - Fixed target name translation for any dawn images with target "4 CERES" [#5294](https://github.com/DOI-USGS/ISIS3/pull/5294) - Fixed exception pop ups in qview when viewing images created using the CSM Camera [#5259](https://github.com/DOI-USGS/ISIS3/pull/5295/files) - Fixed shadowtau input file parseing errors when using example file [#5316](https://github.com/DOI-USGS/ISIS3/pull/5316) +- Fixed ProgramLauncher failing while reporting errors from launched programs [#5331](https://github.com/DOI-USGS/ISIS3/pull/5331) ## [8.0.1] - 2023-08-23 diff --git a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp index 84af06cadaba78f1d7e754d8d40b45bb367e14e7..08cb8ed0f46ecf0472c647e555f763f979760bb1 100644 --- a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp +++ b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp @@ -178,7 +178,6 @@ namespace Isis { for(int i = 0; i < errorPvl.groups(); i++) { PvlGroup &g = errorPvl.group(i); - QString eclass = g["Class"]; QString emsg = g["Message"]; int ecode = g["Code"]; QString efile = g["File"]; diff --git a/isis/src/base/objs/iTime/iTime.cpp b/isis/src/base/objs/iTime/iTime.cpp index ac3b593964a6ebaee33ffb946d5255c2b6b48006..5a30402785dd7ff96089cd0b27f559250b1f17c2 100644 --- a/isis/src/base/objs/iTime/iTime.cpp +++ b/isis/src/base/objs/iTime/iTime.cpp @@ -478,9 +478,16 @@ namespace Isis { QString baseDir = dataDir["Base"]; baseDir += "/kernels/lsk/"; FileName leapSecond(baseDir + "naif????.tls"); + QString leapSecondName; + try { + leapSecondName = QString(leapSecond.highestVersion().expanded()); + } + catch (IException &e) { + QString msg = "Unable to load leadsecond file. Either the data area is not set or there are no naif####.tls files present"; + throw IException(e, IException::User, msg, _FILEINFO_); + } NaifStatus::CheckErrors(); - QString leapSecondName(leapSecond.highestVersion().expanded()); furnsh_c(leapSecondName.toLatin1().data()); NaifStatus::CheckErrors();