comparison src/Analyser.cpp @ 446:abd0dea16584

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

     m_document = doc;
     m_fileModel = model;
     m_paneStack = paneStack;
     m_pane = pane;
 
+    if (!m_fileModel) return "Internal error: Analyser::newFileLoaded() called with no model present";
+    
     connect(doc, SIGNAL(layerAboutToBeDeleted(Layer *)),
             this, SLOT(layerAboutToBeDeleted(Layer *)));
 
     QSettings settings;
     settings.beginGroup("Analyser");

 {
     if (!m_document) return "Internal error: Analyser::analyseExistingFile() called with no document present";
 
     if (!m_pane) return "Internal error: Analyser::analyseExistingFile() called with no pane present";
 
+    if (!m_fileModel) return "Internal error: Analyser::analyseExistingFile() called with no model present";
+    
     if (m_layers[PitchTrack]) {
         m_document->removeLayerFromView(m_pane, m_layers[PitchTrack]);
         m_layers[PitchTrack] = 0;
     }
     if (m_layers[Notes]) {

 }
 
 QString
 Analyser::addVisualisations()
 {
+    if (!m_fileModel) return "Internal error: Analyser::addVisualisations() called with no model present";
+
     // A spectrogram, off by default. Must go at the back because it's
     // opaque
 
 /* This is roughly what we'd do for a constant-Q spectrogram, but it
    currently has issues with y-axis alignment