From fbca094dda2a23860a74561dd994de8b0dab33aa Mon Sep 17 00:00:00 2001 From: Rob Cutmore Date: Sun, 24 Jan 2016 20:15:27 -0500 Subject: [PATCH] Fix input validation in StartScriptCreator --- apps/opencs/view/world/startscriptcreator.cpp | 18 +++--------------- apps/opencs/view/world/startscriptcreator.hpp | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp index 57ac34b8f..7495da035 100644 --- a/apps/opencs/view/world/startscriptcreator.cpp +++ b/apps/opencs/view/world/startscriptcreator.cpp @@ -75,27 +75,15 @@ std::string CSVWorld::StartScriptCreator::getErrors() const std::string errors; if (scriptId.empty()) { - if (!errors.empty()) - { - errors += "
"; - } - errors += "No Script ID entered"; + errors = "No Script ID entered"; } else if (getData().getScripts().searchId(scriptId) == -1) { - if (!errors.empty()) - { - errors += "
"; - } - errors += "Script ID not found"; + errors = "Script ID not found"; } else if (getData().getStartScripts().searchId(scriptId) > -1) { - if (!errors.empty()) - { - errors += "
"; - } - errors += "Script with this ID already registered as Start Script"; + errors = "Script with this ID already registered as Start Script"; } return errors; diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp index 745dce819..473e2fd5f 100644 --- a/apps/opencs/view/world/startscriptcreator.hpp +++ b/apps/opencs/view/world/startscriptcreator.hpp @@ -50,7 +50,7 @@ namespace CSVWorld const std::string& originId, const CSMWorld::UniversalId::Type type); - /// \return Formatted error descriptions for current user input. + /// \return Error description for current user input. virtual std::string getErrors() const; /// \brief Set focus to script ID input widget.