comparison framework/Document.cpp @ 79:b1a68403714b

* Further model lifecycle fixes

 	    if (model == m_mainModel) {
 		// just in case!
 		std::cerr << "Document::~Document: WARNING: Main model is also"
 			  << " in models list!" << std::endl;
 	    } else if (model) {
+                model->aboutToDelete();
 		emit modelAboutToBeDeleted(model);
-                model->aboutToDelete();
 		delete model;
 	    }
 	    m_models.erase(m_models.begin());
 	}
     }

 #ifdef DEBUG_DOCUMENT
     std::cerr << "Document::~Document: About to get rid of main model"
 	      << std::endl;
 #endif
     if (m_mainModel) {
+        m_mainModel->aboutToDelete();
         emit modelAboutToBeDeleted(m_mainModel);
-        m_mainModel->aboutToDelete();
     }
 
     emit mainModelChanged(0);
     delete m_mainModel;
 

             alignModel(i->first);
         }
     }
 
     if (oldMainModel) {
+        oldMainModel->aboutToDelete();
         emit modelAboutToBeDeleted(oldMainModel);
-        oldMainModel->aboutToDelete();
     }
 
     emit mainModelChanged(m_mainModel);
 
     delete oldMainModel;

 		      << model << " even though it is source for "
 		      << sourceCount << " other derived model(s) -- resetting "
 		      << "their source fields appropriately" << std::endl;
 	}
 
+        model->aboutToDelete();
 	emit modelAboutToBeDeleted(model);
-        model->aboutToDelete();
 	m_models.erase(model);
 	delete model;
     }
 }