diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-05-29 16:12:36 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-05-29 16:12:36 +0000 |
| commit | d04860c5b4725baed4db6f992f5728407cc72d87 (patch) | |
| tree | afc0011377e40c03903e596fbc36360ec2aff556 /src/layer-manager.cpp | |
| parent | default inkboard to off for the remainder of the freeze (diff) | |
| download | inkscape-d04860c5b4725baed4db6f992f5728407cc72d87.tar.gz inkscape-d04860c5b4725baed4db6f992f5728407cc72d87.zip | |
workaround assertion upon file revert
(bzr r1064)
Diffstat (limited to 'src/layer-manager.cpp')
| -rw-r--r-- | src/layer-manager.cpp | 9 |
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(); + } } } |