From 3ac030d75acfbe6a6bbbf628648205b390086561 Mon Sep 17 00:00:00 2001 From: Capostrophic <21265616+Capostrophic@users.noreply.github.com> Date: Thu, 2 Aug 2018 09:49:53 +0300 Subject: [PATCH] Handle explicit calls before handling quotes --- apps/openmw/mwgui/console.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index dee2d4a31..b367c6f49 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -303,6 +303,14 @@ namespace MWGui bool has_front_quote = false; /* Does the input string contain things that don't have to be completed? If yes erase them. */ + + /* Erase a possible call to an explicit reference. */ + size_t explicitPos = tmp.find("->"); + if (explicitPos != std::string::npos) + { + tmp.erase(0, explicitPos+2); + } + /* Are there quotation marks? */ if( tmp.find('"') != std::string::npos ) { int numquotes=0; @@ -340,13 +348,6 @@ namespace MWGui } } - // Erase a possible call to an explicit reference - size_t explicitPos = tmp.find("->"); - if (explicitPos != std::string::npos) - { - tmp.erase(0, explicitPos+2); - } - /* Erase the input from the output string so we can easily append the completed form later. */ output.erase(output.end()-tmp.length(), output.end());