From 246b947fa747a1fd54e0b4a58516e1b3a9465c1a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 11 Sep 2021 12:26:16 +0300
Subject: [PATCH] Always assign colors when assigning palettes.

---
 ui/image/image_prepare.cpp      | 1 +
 ui/style/style_core_palette.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 98e3065..3219b3b 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -870,6 +870,7 @@ QImage GenerateLinearGradient(
 			stops.append({ point, color });
 			point += step;
 		}
+		gradient.setStops(std::move(stops));
 	}
 	p.fillRect(QRect(QPoint(), size), QBrush(std::move(gradient)));
 	p.end();
diff --git a/ui/style/style_core_palette.cpp b/ui/style/style_core_palette.cpp
index 4d6cab0..687c764 100644
--- a/ui/style/style_core_palette.cpp
+++ b/ui/style/style_core_palette.cpp
@@ -55,7 +55,7 @@ void palette::finalize() {
 palette &palette::operator=(const palette &other) {
 	auto wasReady = _ready;
 	for (int i = 0; i != kCount; ++i) {
-		if (other._status[i] == Status::Loaded) {
+		if (other._status[i] != Status::Initial) {
 			if (_status[i] == Status::Initial) {
 				new (data(i)) internal::ColorData(*other.data(i));
 			} else {