diff options
| author | Martin Owens <doctormo@gmail.com> | 2019-03-06 23:34:48 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2019-03-06 23:34:48 +0000 |
| commit | 05597a9a00ba401af65e3b766d7148c3bc7d73df (patch) | |
| tree | 2e304c2637ff0f2dd830051fe6c4d76866b348e4 /src/object/sp-use-reference.cpp | |
| parent | Merge: fix toggling snap with key shortcut breaks history (diff) | |
| parent | Stop crash on loading text on path (diff) | |
| download | inkscape-05597a9a00ba401af65e3b766d7148c3bc7d73df.tar.gz inkscape-05597a9a00ba401af65e3b766d7148c3bc7d73df.zip | |
Merge: Fix crash on opening file with text on path...
Diffstat (limited to 'src/object/sp-use-reference.cpp')
| -rw-r--r-- | src/object/sp-use-reference.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/object/sp-use-reference.cpp b/src/object/sp-use-reference.cpp index 61a8330a8..f2b857566 100644 --- a/src/object/sp-use-reference.cpp +++ b/src/object/sp-use-reference.cpp @@ -25,7 +25,7 @@ bool SPUseReference::_acceptObject(SPObject * const obj) const { - return URIReference::_acceptObject(obj); + return URIReference::_acceptObject(obj); } @@ -208,18 +208,16 @@ void SPUsePath::refresh_source() SPItem *item = SP_ITEM(refobj); - if (SP_IS_SHAPE(item)) - { - originalPath = SP_SHAPE(item)->getCurve()->copy(); - } - else if (SP_IS_TEXT(item)) - { + if (SP_IS_SHAPE(item)) { + SPCurve *originalCurve = SP_SHAPE(item)->getCurve(); + if (originalCurve != nullptr) { + originalPath = originalCurve->copy(); + } else { + sourceDirty = true; + } + } else if (SP_IS_TEXT(item)) { originalPath = SP_TEXT(item)->getNormalizedBpath()->copy(); } - else - { - return; - } } |