summaryrefslogtreecommitdiffstats
path: root/src/widgets/lpe-toolbar.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-07-09 16:40:49 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-07-09 16:40:49 +0000
commiteed38c52370d904571447d0bcf19857be91059c0 (patch)
tree1d42b837f9ea0635ae79ca927a0d8255ed5fd269 /src/widgets/lpe-toolbar.cpp
parentFix make check (diff)
parentAdd signals to ToggleButton; more coding style (diff)
downloadinkscape-eed38c52370d904571447d0bcf19857be91059c0.tar.gz
inkscape-eed38c52370d904571447d0bcf19857be91059c0.zip
Update to experimental r13428
(bzr r13090.1.89)
Diffstat (limited to 'src/widgets/lpe-toolbar.cpp')
-rw-r--r--src/widgets/lpe-toolbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index e9e5af912..94d42b5eb 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -180,6 +180,7 @@ static void lpetool_unit_changed(GtkAction* /*act*/, GObject* tbl)
{
UnitTracker* tracker = reinterpret_cast<UnitTracker*>(g_object_get_data(tbl, "tracker"));
Unit const *unit = tracker->getActiveUnit();
+ g_return_if_fail(unit != NULL);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setString("/tools/lpetool/unit", unit->abbr);
@@ -281,6 +282,7 @@ void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GO
tracker->setActiveUnit(sp_desktop_namedview(desktop)->doc_units);
g_object_set_data(holder, "tracker", tracker);
Unit const *unit = tracker->getActiveUnit();
+ g_return_if_fail(unit != NULL);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setString("/tools/lpetool/unit", unit->abbr);