diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-12-07 23:45:01 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-12-07 23:45:01 +0000 |
| commit | a0bef55aef1f82f56535cfadf30247657ccc3f90 (patch) | |
| tree | a5523d84140303998f86072c6263e16af6d5d15e /src/ui/uxmanager.cpp | |
| parent | cppification : GHashMaps replaced by stl maps. getResouceList now gives a std... (diff) | |
| parent | static code analysis (diff) | |
| download | inkscape-a0bef55aef1f82f56535cfadf30247657ccc3f90.tar.gz inkscape-a0bef55aef1f82f56535cfadf30247657ccc3f90.zip | |
update to trunk
(bzr r14504.1.7)
Diffstat (limited to 'src/ui/uxmanager.cpp')
| -rw-r--r-- | src/ui/uxmanager.cpp | 9 |
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; |