Merge branch 'develop' into ryzomclassic-develop

nel/src/gui/css_style.cpp

@@ -1039,36 +1039,39 @@ namespace NLGUI
 						// second loop -> false && break
 						loop = !loop;
 
-						val = toLowerAscii(parts[next]);
+						if (next < parts.size())
-						if (val == "center")
-						{
-							if (bgPositionX.empty()) bgPositionX = "center";
-							if (bgPositionY.empty()) bgPositionY = "center";
-							// consume 'center'
-							next++;
-						}
-						else if (val == "left" || val == "right")
 						{
-							bgPositionX = val;
+							val = toLowerAscii(parts[next]);
-							// consume 'left|right'
+							if (val == "center")
-							next++;
-							if(next < parts.size() && getCssLength(fval, unit, parts[next]))
 							{
-								bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
+								if (bgPositionX.empty()) bgPositionX = "center";
-								// consume css length
+								if (bgPositionY.empty()) bgPositionY = "center";
+								// consume 'center'
 								next++;
 							}
-						}
+							else if (val == "left" || val == "right")
-						else if (val == "top" || val == "bottom")
-						{
-							bgPositionY = val;
-							// consume top|bottom
-							next++;
-							if (next < parts.size() && getCssLength(fval, unit, parts[next]))
 							{
-								bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
+								bgPositionX = val;
-								// consume css length
+								// consume 'left|right'
 								next++;
+								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+								{
+									bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
+									// consume css length
+									next++;
+								}
+							}
+							else if (val == "top" || val == "bottom")
+							{
+								bgPositionY = val;
+								// consume top|bottom
+								next++;
+								if (next < parts.size() && getCssLength(fval, unit, parts[next]))
+								{
+									bgPositionY += " " + toString("%.0f%s", fval, unit.c_str());
+									// consume css length
+									next++;
+								}
 							}
 						}
 					} while (loop);