Commit c24d8d91 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

PROG: Recovering from bad git merge (accidently merged ipceDocks into ipce).

parent 52920c86

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ namespace Isis { 
      if ( QMdiArea *mdiArea = qobject_cast<QMdiArea *>( centralWidget() ) ) {

        mdiArea->addSubWindow(newWidget);

        newWidget->show();

        mdiArea->setActiveSubWindow(qobject_cast<QMdiSubWindow *>(newWidget));

        setActiveView(qobject_cast<AbstractProjectItemView *>(newWidget));

      }

    }

  }

isis/src/qisis/apps/ipce/IpceMainWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ namespace Isis { 
   *                           containing the given widget. In the closeEvent method check whether

   *                           there is an active control and if it has been modified as additional

   *                           test to determine whether project needs saving.

   *   @history 2018-05-01 Tracie Sucharski - Code accidently left commented from previous checking.

   *                           Fixes #5412.

   *  

   */

  class IpceMainWindow : public QMainWindow {