From adc89b3a82410bce94ed9525faf170b7aa076f27 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 18 Aug 2018 09:16:14 +0300
Subject: [PATCH] Fixed: style inheritance for underline, strikethrough

--HG--
branch : develop
---
 code/nel/src/gui/group_html.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 9a987d450..45398102b 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -6175,6 +6175,12 @@ namespace NLGUI
 	{
 		const CStyleParams current = _Style;
 
+		if (inherit)
+		{
+			style.Underlined = current.Underlined;
+			style.StrikeThrough = current.StrikeThrough;
+		}
+
 		float tmpf;
 		TStyle styles = parseStyle(styleString);
 		TStyle::iterator it;
@@ -6396,11 +6402,6 @@ namespace NLGUI
 					style.GlobalColor = b;
 			}
 		}
-		if (inherit)
-		{
-			style.Underlined = current.Underlined || style.Underlined;
-			style.StrikeThrough = current.StrikeThrough || style.StrikeThrough;
-		}
 	}
 
 	// ***************************************************************************