Commit e06dcc58 authored by chrisryancombs's avatar chrisryancombs
Browse files

Fixed issue with Huber Modified enumeration causing seg fault

parent be8a4132

isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp

+55 −56
Original line number Diff line number Diff line
@@ -360,10 +360,9 @@ namespace Isis { 
    if (modelName.compare("HUBER", Qt::CaseInsensitive) == 0) {

      return Huber;

    }

    else if (modelName.compare("HUBER_MODIFIED", Qt::CaseInsensitive) == 0) {

      return HuberModified;

    }

    else if (modelName.compare("HUBERMODIFIED", Qt::CaseInsensitive) == 0) {

    else if (modelName.compare("HUBER_MODIFIED", Qt::CaseInsensitive) == 0 ||

             modelName.compare("HUBERMODIFIED", Qt::CaseInsensitive) == 0 ||

             modelName.compare("HUBER MODIFIED", Qt::CaseInsensitive) == 0) {

      return HuberModified;

    }

    else if (modelName.compare("WELSCH", Qt::CaseInsensitive) == 0) {

isis/src/qisis/objs/JigsawRunWidget/JigsawRunWidget.cpp

+7 −0
Original line number Diff line number Diff line
@@ -645,6 +645,13 @@ namespace Isis { 
  }





  /**

   * This method is called whenever the widget recieves a close request. If a bundle is running, the

   * user will be asked if they want to abort the bundle. In this case, the bundle thread must be

   * scheduled to delete when it has finished aborting. Otherwise, the event will accept. 

   *

   * @param event The close event being handled.

   */

  void JigsawRunWidget::closeEvent(QCloseEvent *event) {

    if( m_bRunning ) {

      QMessageBox::StandardButton resBtn =