Commit a87d0325 authored by Adam Goins's avatar Adam Goins
Browse files

Modified ImportControlNetWorkOrder to not undo the last WorkOrder on the stack... 

Modified ImportControlNetWorkOrder to not undo the last WorkOrder on the stack if it failed to import a cnet. Fixes #5186

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

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

+0 −4
Original line number Diff line number Diff line
@@ -194,10 +194,6 @@ namespace Isis { 
   * from postSyncRedo() to postExecution().

   */

  void ImportControlNetWorkOrder::postExecution() {

    if (!m_list) {

      project()->undoStack()->undo();

      m_list = NULL;

    }



    if (m_warning != "") {

      project()->warn(m_warning);

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

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ namespace Isis { 
   *                           order. This pointer is used in the Undo funtions. #5064

   *   @history 2017-08-11 Cole Neubauer - Refactored import so it closes the controlNet after

   *                           Control is created Fixes #5026

   *   @histroy 2017-10-24 Adam Goins - Removed the undoStack() call that occurred when a

   *                           Failed cnet is imported. Fixes #5186

   */

  class ImportControlNetWorkOrder : public WorkOrder {

      Q_OBJECT