summaryrefslogtreecommitdiffstats
path: root/src/verbs.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-29 23:22:37 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-29 23:22:37 +0000
commitd4c92eb19b82184433aee3f941fb97b2f4818027 (patch)
tree4f47ce8d1642d580da9e10d8dcd160950ab33bc4 /src/verbs.cpp
parentImproved support for clipping on EMF/WMF import, see bug 1302857 (diff)
downloadinkscape-d4c92eb19b82184433aee3f941fb97b2f4818027.tar.gz
inkscape-d4c92eb19b82184433aee3f941fb97b2f4818027.zip
Fix bug #1290573 and #1310802
(bzr r13323)
Diffstat (limited to 'src/verbs.cpp')
-rw-r--r--src/verbs.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp
index ab6c25973..eee7aef75 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1372,6 +1372,10 @@ void LayerVerb::perform(SPAction *action, void *data)
survivor = Inkscape::previous_layer(dt->currentRoot(), old_layer);
}
+ if (survivor == old_layer->lastChild()) {
+ //oops: layer_fns messed up. BADLY.
+ survivor = NULL;
+ }
// Deleting the old layer before switching layers is a hack to trigger the
// listeners of the deletion event (as happens when old_layer is deleted using the
// xml editor). See