From 3af30a88a8af857720c4ec43efbfa7794d101ea4 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Wed, 26 Feb 2025 22:26:36 -0500 Subject: [PATCH] Fix a confused error message --- src/dialogxml/dialogs/dialog.cpp | 2 +- src/dialogxml/widgets/control.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialogxml/dialogs/dialog.cpp b/src/dialogxml/dialogs/dialog.cpp index 1a461484..32cc99d5 100644 --- a/src/dialogxml/dialogs/dialog.cpp +++ b/src/dialogxml/dialogs/dialog.cpp @@ -1132,7 +1132,7 @@ bool cDialog::hasControl(std::string id) const { return false; } -const char*const xBadVal::CONTENT = ""; +const char*const xBadVal::CONTENT = "$content$"; cDialogIterator::cDialogIterator() : parent(nullptr) {} diff --git a/src/dialogxml/widgets/control.cpp b/src/dialogxml/widgets/control.cpp index c0244654..61df8750 100644 --- a/src/dialogxml/widgets/control.cpp +++ b/src/dialogxml/widgets/control.cpp @@ -443,7 +443,7 @@ std::string cControl::parse(ticpp::Element& who, std::string fname) { nodeTag = node->Value(); if(type == TiXmlNode::COMMENT) continue; else if(!parseContent(*node, foundNodes.count(nodeTag), tagName, fname, text)) { - std::string val = nodeTag.empty() ? nodeTag : xBadVal::CONTENT; + std::string val = nodeTag.empty() ? xBadVal::CONTENT : nodeTag; throw xBadVal(tagName, xBadVal::CONTENT, val, node->Row(), node->Column(), fname); } foundNodes.insert(nodeTag);