From 8b3ea8c421c96f6546c2db520906c9f66de74813 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 29 Sep 2021 02:41:26 -0700 Subject: [PATCH] project: fixed bugs in error handling --- app/node/node.cpp | 4 +++- app/node/project/project.cpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/node/node.cpp b/app/node/node.cpp index 756077333..d79710962 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -359,11 +359,13 @@ void Node::LoadInput(QXmlStreamReader *reader, XMLNodeData &xml_node_data, const if (param_id.isEmpty()) { qWarning() << "Failed to load parameter with missing ID"; + reader->skipCurrentElement(); return; } if (!HasInputWithID(param_id)) { - qWarning() << "Failed to load parameter that didn't exist"; + qWarning() << "Failed to load parameter that didn't exist:" << param_id; + reader->skipCurrentElement(); return; } diff --git a/app/node/project/project.cpp b/app/node/project/project.cpp index 26f0336c1..0650591c5 100644 --- a/app/node/project/project.cpp +++ b/app/node/project/project.cpp @@ -111,6 +111,7 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, uint if (id.isEmpty()) { qWarning() << "Failed to load node with empty ID"; + reader->skipCurrentElement(); } else { Node* node; @@ -126,6 +127,7 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, uint if (!node) { qWarning() << "Failed to find node with ID" << id; + reader->skipCurrentElement(); } else { node->Load(reader, xml_node_data, version, cancelled); node->setParent(this); @@ -168,6 +170,7 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, uint SetNodePosition(node, context, node_pos); } else { qWarning() << "Failed to find pointer for node position"; + reader->skipCurrentElement(); } } } else {