From 35b0546737f3dfa7f08bd3202a054648da0f35ae Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Sat, 23 Jun 2018 14:21:21 +0300
Subject: [PATCH] Consider <p> tag when discarding post-EOL tag text
 (regression #4473)

---
 apps/openmw/mwgui/formatting.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 16568e2f3..edcb94eed 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -31,13 +31,16 @@ namespace MWGui
 
             boost::algorithm::replace_all(mText, "\r", "");
 
-            // vanilla game does not show any text after last <BR> tag.
+            // vanilla game does not show any text after the last EOL tag.
             const std::string lowerText = Misc::StringUtils::lowerCase(mText);
-            int index = lowerText.rfind("<br>");
-            if (index == -1)
+            int brIndex = lowerText.rfind("<br>");
+            int pIndex = lowerText.rfind("<p>");
+            if (brIndex == pIndex)
                 mText = "";
+            else if (brIndex > pIndex)
+                mText = mText.substr(0, brIndex+4);
             else
-                mText = mText.substr(0, index+4);
+                mText = mText.substr(0, pIndex+3);
 
             registerTag("br", Event_BrTag);
             registerTag("p", Event_PTag);