diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/layer-selector.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 4f8d921e6..c06f70185 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -240,7 +240,9 @@ private: void LayerSelector::_layersChanged() { - //_selectLayer(_desktop->currentLayer()); + if (_desktop) { + _selectLayer(_desktop->currentLayer()); + } } /** Selects the given layer in the dropdown selector. diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 81361f0f9..9f18cc671 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -680,6 +680,7 @@ static void sp_desktop_widget_dispose(GObject *object) g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw); g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->canvas), (gpointer) G_CALLBACK (sp_desktop_widget_event), dtw); + dtw->layer_selector->setDesktop(NULL); dtw->layer_selector->unreference(); inkscape_remove_desktop (dtw->desktop); // clears selection too dtw->modified_connection.disconnect(); |