# HG changeset patch # User Chris Cannam # Date 1407942636 -3600 # Node ID 5b4206f7d7d4ee28a24dd0b2d9fe6413a5d21b5f # Parent e2d2ac12577c85ba0367499cef91895281c11f42 Remove model from pan layer when it's about to be deleted, fixing #1035 diff -r e2d2ac12577c -r 5b4206f7d7d4 main/MainWindow.cpp --- a/main/MainWindow.cpp Wed Aug 13 16:09:11 2014 +0100 +++ b/main/MainWindow.cpp Wed Aug 13 16:10:36 2014 +0100 @@ -4147,6 +4147,19 @@ } void +MainWindow::modelAboutToBeDeleted(Model *model) +{ + if (model == m_panLayer->getModel()) { + if (model == getMainModel()) { + m_panLayer->setModel(0); + } else { + m_panLayer->setModel(getMainModel()); + } + } + MainWindowBase::modelAboutToBeDeleted(model); +} + +void MainWindow::setInstantsNumbering() { QAction *a = dynamic_cast(sender()); diff -r e2d2ac12577c -r 5b4206f7d7d4 main/MainWindow.h --- a/main/MainWindow.h Wed Aug 13 16:09:11 2014 +0100 +++ b/main/MainWindow.h Wed Aug 13 16:10:36 2014 +0100 @@ -132,6 +132,7 @@ virtual void mainModelChanged(WaveFileModel *); virtual void modelAdded(Model *); + virtual void modelAboutToBeDeleted(Model *); virtual void showLayerTree(); virtual void showActivityLog();