use first color in "foregroundColors" as "foregroundColor" when

"foregroundColor" is not defined!
use first color in "backgroundColors" as "backgroundColor" when
"backgroundColor" is not defined"

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index 5f74b75c..49e94e6e 100644
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -46,20 +46,32 @@ class MultiColorLabel(Label):
 
 	def applySkin(self, desktop, screen):
 		if self.skinAttributes is not None:
+			foregroundColor = None
+			backgroundColor = None
 			attribs = [ ]
 			for (attrib, value) in self.skinAttributes:
 				if attrib == "foregroundColors":
 					colors = value.split(',')
-					attribs.append(("foregroundColor",colors[0] ))
 					for color in colors:
 						self.foreColors.append(parseColor(color))
+					if not foregroundColor:
+						foregroundColor = colors[0]
 				elif attrib == "backgroundColors":
 					colors = value.split(',')
-					attribs.append(("backgroundColor",colors[0] ))
 					for color in colors:
 						self.backColors.append(parseColor(color))
+					if not backgroundColor:
+						backgroundColor = colors[0]
+				elif attrib == "backgroundColor":
+					backgroundColor = value
+				elif attrib == "foregroundColor":
+					foregroundColor = value
 				else:
 					attribs.append((attrib,value))
+			if foregroundColor:
+				attribs.append(("foregroundColor",foregroundColor))
+			if backgroundColor:
+				attribs.append(("backgroundColor",backgroundColor))
 			self.skinAttributes = attribs
 		return GUIComponent.applySkin(self, desktop, screen)