diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-15 01:50:06 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-15 01:50:06 +0000 |
| commit | 6f508cfcaa161695711309d3413b90d2b3f44ea0 (patch) | |
| tree | 32ca88b4cce16f97d72e8994497006720ee60dea | |
| parent | Update to trunk (checking build failure on Windows) (diff) | |
| download | inkscape-6f508cfcaa161695711309d3413b90d2b3f44ea0.tar.gz inkscape-6f508cfcaa161695711309d3413b90d2b3f44ea0.zip | |
Minor things
(bzr r13090.1.58)
| -rw-r--r-- | src/knotholder.cpp | 11 | ||||
| -rw-r--r-- | src/live_effects/Makefile_insert | 3 | ||||
| -rw-r--r-- | src/sp-lpe-item.cpp | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/src/knotholder.cpp b/src/knotholder.cpp index 30a7e58d5..aea983cbb 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -154,8 +154,15 @@ KnotHolder::knot_clicked_handler(SPKnot *knot, guint state) } // for drag, this is done by ungrabbed_handler, but for click we must do it here - DocumentUndo::done(saved_item->document, object_verb, - _("Change handle")); + + if (saved_item) { //increasingly aggressive sanity checks + if (saved_item->document) { + if (object_verb <= SP_VERB_LAST && object_verb >= SP_VERB_INVALID) { + DocumentUndo::done(saved_item->document, object_verb, + _("Change handle")); + } + } + } // else { abort(); } } void diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert index ac7c33e2f..e2c35c3bd 100644 --- a/src/live_effects/Makefile_insert +++ b/src/live_effects/Makefile_insert @@ -88,12 +88,13 @@ ink_common_sources += \ live_effects/lpe-attach-path.cpp \ live_effects/lpe-attach-path.h \ live_effects/lpe-fill-between-strokes.cpp \ - live_effects/lpe-fill-between-stroke.h \ + live_effects/lpe-fill-between-strokes.h \ live_effects/lpe-fill-between-many.cpp \ live_effects/lpe-fill-between-many.h \ live_effects/lpe-ellipse_5pts.cpp \ live_effects/lpe-ellipse_5pts.h \ live_effects/pathoutlineprovider.cpp \ + live_effects/pathoutlineprovider.h \ live_effects/lpe-jointype.cpp \ live_effects/lpe-jointype.h \ live_effects/lpe-taperstroke.cpp \ diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 07fa6147b..ae5763e67 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -689,12 +689,20 @@ static std::string hreflist_write_svg(HRefList const & list) // Return a copy of the effect list PathEffectList SPLPEItem::getEffectList() { + if (!path_effect_list) { + g_critical("Broken path effect list in %s\n", __FILE__); + return PathEffectList(); + } return *path_effect_list; } // Return a copy of the effect list PathEffectList const SPLPEItem::getEffectList() const { + if (!path_effect_list) { + g_critical("Broken path effect list in %s\n", __FILE__); + return PathEffectList(); + } return *path_effect_list; } |