summaryrefslogtreecommitdiffstats
path: root/src/layer-manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/layer-manager.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index e2e40340f..61b0e15bb 100644
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
@@ -75,10 +75,13 @@ LayerManager::LayerManager(SPDesktop *desktop)
void LayerManager::setCurrentLayer( SPObject* obj )
{
- _desktop->setCurrentLayer( obj );
+ //g_return_if_fail( _desktop->currentRoot() );
+ if ( _desktop->currentRoot() ) {
+ _desktop->setCurrentLayer( obj );
- if ( prefs_get_int_attribute_limited("options.selection", "layerdeselect", 1, 0, 1) ) {
- sp_desktop_selection( _desktop )->clear();
+ if ( prefs_get_int_attribute_limited("options.selection", "layerdeselect", 1, 0, 1) ) {
+ sp_desktop_selection( _desktop )->clear();
+ }
}
}