Commit 06995d6e authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Changed error message when using an incorrect -restore file with an ISIS application. Fixes #2366 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6680 41f8697f-d340-4b68-9986-7bafba869bb8
parent 51bab7e1

isis/src/base/objs/UserInterface/UserInterface.cpp

+2 −1
Original line number Diff line number Diff line
@@ -557,7 +557,8 @@ namespace Isis { 
         throw Isis::iException::Message( Isis::iException::User, msg, _FILEINFO_ );*/

      }

      catch (...) {

        QString msg = "The history file [" + file + "] is corrupt, please fix or delete this file";

        QString msg = "The history file [" + file + "] is for a different application or corrupt, "\

                      "please fix or delete this file";

        throw IException(IException::User, msg, _FILEINFO_);

      }

    }

isis/src/base/objs/UserInterface/UserInterface.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ namespace Isis { 
   *                           when using an invalid reserved parameter (e.g. -x).

   *   @history 2014-06-18 Ian Humphrey - Finished developing unitTest.cpp and reorganized. 

   *                           Added lacking [at]throws documentation to UserInterface.cpp.

   *   @history 2016-04-05 Jesse Mapel - Changed bad histroy file error message to reflect that

   *                           the history file could be for a different application. Fixes #2366

   *                           

   */

isis/src/base/objs/UserInterface/UserInterface.truth

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ TO: Worked 
GUI:     0



Testing -RESTORE with corrupt .par file

**USER ERROR** The history file [unitTestCorrupt.par] is corrupt, please fix or delete this file.

**USER ERROR** The history file [unitTestCorrupt.par] is for a different application or corrupt, please fix or delete this file.



Testing -RESTORE with invalid (non-existing) .par file

**USER ERROR** The history file [junk.par] does not exist.