From 18d5ce777ef2c140e48adf20887efc8892e01c26 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 25 Dec 2019 13:16:50 +0300 Subject: [PATCH] Fix panel background colors coding fallback --- .../Sources/PresentationThemeCodable.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 60753ba0f2..817e2ddefe 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -1339,10 +1339,9 @@ extension PresentationThemeChatInputPanel: Codable { public convenience init(from decoder: Decoder) throws { let values = try decoder.container(keyedBy: CodingKeys.self) - let panelBackgroundColor = try decodeColor(values, .panelBg) - let panelBackgroundColorNoWallpaper = try decodeColor(values, .panelBgNoWallpaper) - self.init(panelBackgroundColor: panelBackgroundColor, - panelBackgroundColorNoWallpaper: panelBackgroundColorNoWallpaper ?? panelBackgroundColor, + let codingPath = decoder.codingPath.map { $0.stringValue }.joined(separator: ".") + self.init(panelBackgroundColor: try decodeColor(values, .panelBg), + panelBackgroundColorNoWallpaper: try decodeColor(values, .panelBg, decoder: decoder, fallbackKey: codingPath + ".panelBgNoWallpaper"), panelSeparatorColor: try decodeColor(values, .panelSeparator), panelControlAccentColor: try decodeColor(values, .panelControlAccent), panelControlColor: try decodeColor(values, .panelControl),