fix undo bug in nodepath_preserve; fix crash caused by nodepath_cleanup deleting...

[inkscape.git] / src / sp-switch.cpp

diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index 64aa868ccd1f39611b395fad99bc3eb8ade5729b..d7bc6bba0a4eadd2da4f0b25918ec8cafde046ad 100644 (file)
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -71,7 +71,7 @@ CSwitch::~CSwitch() {
 
 SPObject *CSwitch::_evaluateFirst() {
     for (SPObject *child = sp_object_first_child(_group) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
-        if (sp_item_evaluate(SP_ITEM(child)))
+        if (SP_IS_ITEM(child) && sp_item_evaluate(SP_ITEM(child)))
             return child;
     }
     return NULL;