openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix a confused error message

Browse Source
This commit is contained in:
Celtic Minstrel
2025-02-26 22:26:36 -05:00
committed by Celtic Minstrel
parent f018f051f6
commit 3af30a88a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogxml/dialogs/dialog.cpp
View File

@@ -1132,7 +1132,7 @@ bool cDialog::hasControl(std::string id) const {
return false; return false;
} }
const char*const xBadVal::CONTENT = "<content>"; const char*const xBadVal::CONTENT = "$content$";
cDialogIterator::cDialogIterator() : parent(nullptr) {} cDialogIterator::cDialogIterator() : parent(nullptr) {}

2
src/dialogxml/widgets/control.cpp
View File

@@ -443,7 +443,7 @@ std::string cControl::parse(ticpp::Element& who, std::string fname) {
nodeTag = node->Value(); nodeTag = node->Value();
if(type == TiXmlNode::COMMENT) continue; if(type == TiXmlNode::COMMENT) continue;
else if(!parseContent(*node, foundNodes.count(nodeTag), tagName, fname, text)) { 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); throw xBadVal(tagName, xBadVal::CONTENT, val, node->Row(), node->Column(), fname);
} }
foundNodes.insert(nodeTag); foundNodes.insert(nodeTag);