# HG changeset patch # User Chris Cannam # Date 1396355264 -3600 # Node ID dd07d48d7d4f7d033299a9142e04718b86c0ef1d # Parent 3144af512ea3447e6cf1775f02b5b54b5a5ddeb5 Restore dormancy with layer diff -r 3144af512ea3 -r dd07d48d7d4f framework/Document.cpp --- a/framework/Document.cpp Tue Mar 11 14:54:28 2014 +0000 +++ b/framework/Document.cpp Tue Apr 01 13:27:44 2014 +0100 @@ -1193,6 +1193,7 @@ m_d(d), m_view(view), m_layer(layer), + m_wasDormant(layer->isLayerDormant(view)), m_name(qApp->translate("RemoveLayerCommand", "Delete %1 Layer").arg(layer->objectName())), m_added(true) { @@ -1246,7 +1247,7 @@ Document::RemoveLayerCommand::unexecute() { m_view->addLayer(m_layer); - m_layer->setLayerDormant(m_view, false); + m_layer->setLayerDormant(m_view, m_wasDormant); m_d->addToLayerViewMap(m_layer, m_view); m_added = true; diff -r 3144af512ea3 -r dd07d48d7d4f framework/Document.h --- a/framework/Document.h Tue Mar 11 14:54:28 2014 +0000 +++ b/framework/Document.h Tue Apr 01 13:27:44 2014 +0100 @@ -377,6 +377,7 @@ Document *m_d; View *m_view; // I don't own this Layer *m_layer; // Document owns this, but I determine its lifespan + bool m_wasDormant; QString m_name; bool m_added; };