Commit b0207e34 authored by Janet Barrett's avatar Janet Barrett
Browse files

Fixed a problem in which the qmos program was crashing when a cube was closed. Fixes #1992. 

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

isis/src/qisis/objs/ImageFileListWidget/ImageTreeWidget.cpp

+4 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ namespace Isis { 
    try {

      ImageTreeWidgetItem *item = new ImageTreeWidgetItem(imageList, image);



      connect(image, SIGNAL(destroyed(QObject *)),

      connect(image->displayProperties(), SIGNAL(destroyed(QObject *)),

              this, SLOT(imageDeleted(QObject *)));

      connect(image->displayProperties(), SIGNAL(propertyChanged(DisplayProperties *)),

              this, SLOT(propertiesChanged(DisplayProperties *)));
@@ -740,11 +740,11 @@ namespace Isis { 




  void ImageTreeWidget::imageDeleted(QObject *imageObj) {

    Image *image = (Image *)imageObj;

    ImageTreeWidgetItem *item = treeItem(image);

    ImageDisplayProperties *imagedisp = (ImageDisplayProperties *)imageObj;

    ImageTreeWidgetItem *item = treeItem(imagedisp);



    if (item && item->parent()) {

      m_displayPropsToTreeItemLookup.remove(image->displayProperties());

      m_displayPropsToTreeItemLookup.remove(imagedisp);



      item->forgetImage();

      delete item->parent()->takeChild( item->parent()->indexOfChild(item) );

isis/src/qisis/objs/MosaicMainWindow/MosaicController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ namespace Isis { 
   * An open image is being deleted

   */

  void MosaicController::imageClosed(QObject * imageObj) {

    Image *image = qobject_cast<Image *>(imageObj);

    Image *image = (Image *)imageObj;



    if (image) {

      ImageList::iterator foundElement;