Update HyperHdrInstance.cpp

Author: awawa-dev

Diff for: sources/base/HyperHdrInstance.cpp

@@ -237,7 +237,7 @@ void HyperHdrInstance::handleSettingsUpdate(settings::type type, const QJsonDocu
 
 		if (!_raw2ledAdjustment->verifyAdjustments())
 		{
-			Warning(_log, "At least one led has no color calibration, please add all leds from your led layout to an 'LED index' field!");
+			Warning(_log, "At least one led has no color calibration, please add all leds from your led layout to an 'LED index' field (if you disabled these LEDs you can ignore this message)");
 		}
 
 		emit imageToLedsMappingChanged(_imageProcessor->getLedMappingType());
@@ -444,27 +444,29 @@ bool HyperHdrInstance::setInputInactive(quint8 priority)
 
 void HyperHdrInstance::setColor(int priority, const std::vector<ColorRgb>& ledColors, int timeout_ms, const QString& origin, bool clearEffects)
 {
+	if (ledColors.size() == 0)
+		return;
+
 	// clear effect if this call does not come from an effect
 	if (clearEffects)
 	{
 		_effectEngine->channelCleared(priority);
 	}
 
 	// create full led vector from single/multiple colors
-	size_t size = _ledString.leds().size();
 	std::vector<ColorRgb> newLedColors;
-	while (true)
+	auto currentCol = ledColors.begin();
+
+	for (const Led& led: _ledString.leds())
 	{
-		for (const auto& entry : ledColors)
-		{
-			newLedColors.emplace_back(entry);
-			if (newLedColors.size() == size)
-			{
-				goto end;
-			}
-		}
+		if (led.disabled)
+			newLedColors.emplace_back(ColorRgb::BLACK);
+		else
+			newLedColors.emplace_back(*currentCol);
+		
+		if (++currentCol == ledColors.end())
+			currentCol = ledColors.begin();
 	}
-end:
 
 	if (getPriorityInfo(priority).componentId != hyperhdr::COMP_COLOR)
 	{