summaryrefslogtreecommitdiffstats
path: root/src/ui/uxmanager.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-12-08 01:24:07 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-12-08 01:24:07 +0000
commit08a6877d14c0b90e7fe661383f15f20a2a03bd2c (patch)
tree854008faa6cdc3a0546b2a7d84f6505fa1058f76 /src/ui/uxmanager.cpp
parentAdd rect to SP Control point on locked guides (diff)
parentstatic code analysis (diff)
downloadinkscape-08a6877d14c0b90e7fe661383f15f20a2a03bd2c.tar.gz
inkscape-08a6877d14c0b90e7fe661383f15f20a2a03bd2c.zip
update to trunk
(bzr r14500.1.14)
Diffstat (limited to 'src/ui/uxmanager.cpp')
-rw-r--r--src/ui/uxmanager.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 051df691e..036659661 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -244,12 +244,13 @@ void UXManagerImpl::delTrack( SPDesktopWidget* dtw )
void UXManagerImpl::connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
{
- TrackItem &tracker = trackedBoxes[desktop];
- vector<GtkWidget*>& tracked = tracker.boxes;
- if (desktop)
+ if (!desktop)
{
- tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
+ return;
}
+ TrackItem &tracker = trackedBoxes[desktop];
+ vector<GtkWidget*>& tracked = tracker.boxes;
+ tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
for (vector<GtkWidget*>::const_iterator it = toolboxes.begin(); it != toolboxes.end(); ++it ) {
GtkWidget* toolbox = *it;