summaryrefslogtreecommitdiffstats
path: root/src/widgets/desktop-widget.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-09-27 06:53:55 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-09-27 06:53:55 +0000
commit828e688406ed359ad15ed4afc6d048e1cfc1a7b9 (patch)
treeb5a88fb57c5b7bfc7133cf0db3b6cef8aa587ac6 /src/widgets/desktop-widget.cpp
parentfix for 'em' and 'ex' units support (diff)
parentFix for 166691 : Changing layer order does not update layer selector (diff)
downloadinkscape-828e688406ed359ad15ed4afc6d048e1cfc1a7b9.tar.gz
inkscape-828e688406ed359ad15ed4afc6d048e1cfc1a7b9.zip
merge from trunk (r11709)
(bzr r11668.1.19)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
-rw-r--r--src/widgets/desktop-widget.cpp1
1 files changed, 1 insertions, 0 deletions
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();