Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/group_html.cpp

@@ -6200,6 +6200,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;
@@ -6421,11 +6427,6 @@ namespace NLGUI
 					style.GlobalColor = b;
 			}
 		}
-		if (inherit)
-		{
-			style.Underlined = current.Underlined || style.Underlined;
-			style.StrikeThrough = current.StrikeThrough || style.StrikeThrough;
-		}
 	}
 
 	// ***************************************************************************