Mercurial > hg > sonic-visualiser

comparison main/MainWindow.cpp @ 1623:987b406be4b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash when trying to set object name on nonexistent model
author Chris Cannam
date Tue, 28 Feb 2017 09:27:34 +0000
parents 06be7469ee5f
children 6b2e781b0154
comparison
equal deleted inserted replaced
1622:239e95ccdbfd 1623:987b406be4b0
3957 m_playSource, 3957 m_playSource,
3958 startFrame, 3958 startFrame,
3959 duration, 3959 duration,
3960 &configurator); 3960 &configurator);
3961 3961
3962 if (input.getModel() == aggregate) { 3962 if (aggregate) {
3963 aggregate->setObjectName(tr("Multiplexed audio")); 3963 if (input.getModel() == aggregate) {
3964 m_document->addAggregateModel(aggregate); 3964 aggregate->setObjectName(tr("Multiplexed audio"));
3965 } else { 3965 m_document->addAggregateModel(aggregate);
3966 aggregate->aboutToDelete(); 3966 } else {
3967 delete aggregate; 3967 aggregate->aboutToDelete();
3968 delete aggregate;
3969 }
3968 } 3970 }
3969 3971
3970 if (!input.getModel()) return; 3972 if (!input.getModel()) return;
3971 3973
3972 // SVDEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl; 3974 // SVDEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl;