comparison framework/SVFileReader.cpp @ 447:da520a68595a tonioni

When loading a session, do not import any layers for which the identified models can't be found

 		Model *model = m_models[modelId];
 		m_document->setModel(layer, model);
 	    } else {
 		cerr << "WARNING: SV-XML: Unknown model id " << modelId
 			  << " in layer definition" << endl;
+
+                // Don't add a layer with an unknown model id
+                m_document->deleteLayer(layer);
+                m_layers[id] = layer = 0;
+                return false;
 	    }
 	}
 
-	layer->setProperties(attributes);
-    }
-
-    if (!m_inData && m_currentPane) {
+        if (layer) layer->setProperties(attributes);
+    }
+
+    if (!m_inData && m_currentPane && layer) {
 
         QString visible = attributes.value("visible");
         bool dormant = (visible == "false");
 
         // We need to do this both before and after adding the layer

 
         layer->setLayerDormant(m_currentPane, dormant);
     }
 
     m_currentLayer = layer;
-    m_inLayer = true;
+    m_inLayer = (layer != 0);
 
     return true;
 }
 
 bool