Commit 3137c844 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Empty imports may now be deleted. Fixes #5183 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@8299 41f8697f-d340-4b68-9986-7bafba869bb8
parent 0437f417

isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.cpp

+1 −4
Original line number Diff line number Diff line
@@ -68,10 +68,7 @@ namespace Isis { 
   */

  bool RemoveImagesWorkOrder::isExecutable(ImageList *images) {



    if (images) {

      return (images->count() > 0);

    }

    return false;

    return true;

  }

isis/src/qisis/objs/Directory/RemoveImagesWorkOrder.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ namespace Isis { 
   *   @history 2017-10-01 Cole Neubauer - Reimplemented remove images count Fixes #4998.

   *   @history 2017-11-02 Tyler Wilson - Added a null pointer check to the images variable in

   *                           isExecutable to prevent potential seg faults.  References #4492.

   *   @history 2017-11-13 Summer Stapleton - Changed isExecutable to always return true as there

   *                           should never be any time that you should not be able to delete an

   *                           imageList (Import). Fixes #5183

   */

  class RemoveImagesWorkOrder : public WorkOrder {

      Q_OBJECT