comparison framework/Document.cpp @ 52:43ad8d909e28

* Fix #1815930 new crash, just introduced!

     //the document, be nice to fix that
 
 //    std::cerr << "\n\nDocument::~Document: about to clear command history" << std::endl;
     CommandHistory::getInstance()->clear();
     
-//    std::cerr << "Document::~Document: about to delete layers" << std::endl;
+    std::cerr << "Document::~Document: about to delete layers" << std::endl;
     while (!m_layers.empty()) {
 	deleteLayer(*m_layers.begin(), true);
     }
 
     if (!m_models.empty()) {

     if (!newLayer) return 0;
 
     newLayer->setObjectName(getUniqueLayerName(newLayer->objectName()));
 
     m_layers.insert(newLayer);
+
+    std::cerr << "Document::createLayer: Added layer of type " << type
+              << ", now have " << m_layers.size() << " layers" << std::endl;
+
     emit layerAdded(newLayer);
 
     return newLayer;
 }
 

 
     //!!! and all channels
     setChannel(newLayer, -1);
 
     m_layers.insert(newLayer);
+
+    std::cerr << "Document::createImportedLayer: Added layer of type " << type
+              << ", now have " << m_layers.size() << " layers" << std::endl;
+
     emit layerAdded(newLayer);
     return newLayer;
 }
 
 Layer *

     // We need to ensure that no layer is left using oldMainModel or
     // any of the old derived models as its model.  Either replace the
     // model, or delete the layer for each layer that is currently
     // using one of these.  Carry out this replacement before we
     // delete any of the models.
+
+    std::cerr << "Document::setMainModel: Have "
+              << m_layers.size() << " layers" << std::endl;
 
     for (LayerSet::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
 
 	Layer *layer = *i;
 	Model *model = layer->getModel();

 	return;
     }
 
     m_layers.erase(layer);
 
+    std::cerr << "Document::deleteLayer: Removing, now have "
+              << m_layers.size() << " layers" << std::endl;
+
     releaseModel(layer->getModel());
     emit layerRemoved(layer);
     emit layerAboutToBeDeleted(layer);
     delete layer;
 }