summaryrefslogtreecommitdiffstats
path: root/src/ui/uxmanager.cpp
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2015-12-07 20:18:04 +0000
committerKris De Gussem <Kris.De.Gussem@hotmail.com>2015-12-07 20:18:04 +0000
commitddc6177836028eca89fb701ad2e5e923cb94ae87 (patch)
tree8afb813154662cbe687e0396ae3483abfed6dc29 /src/ui/uxmanager.cpp
parentSet minimum line height to "strut" height per CSS. Prevent possible infinite ... (diff)
downloadinkscape-ddc6177836028eca89fb701ad2e5e923cb94ae87.tar.gz
inkscape-ddc6177836028eca89fb701ad2e5e923cb94ae87.zip
static code analysis
(bzr r14508)
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;