MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash when importing custom theme with duplicated entries.

This commit is contained in:
23rd 2023-09-06 14:10:23 +03:00
parent d2bd109169
commit fd79973509
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
View File

@ -225,6 +225,10 @@ void EditorBlock::feed(const QString &name, QColor value, const QString &copyOfE
bool EditorBlock::feedCopy(const QString &name, const QString &copyOf) {
if (auto row = findRow(copyOf)) {
if (copyOf == name) {
LOG(("Theme Warning: Skipping value '%1: %2' (the value refers to itself.)").arg(name, copyOf));
return true;
}
if (findRow(name)) {
// Remove the existing row and mark all its copies as unique keys.
LOG(("Theme Warning: Color value '%1' appears more than once in the color scheme.").arg(name));
@ -232,6 +236,10 @@ bool EditorBlock::feedCopy(const QString &name, const QString &copyOf) {
// row was invalidated by removeRow() call.
row = findRow(copyOf);
// Should not happen, but still check.
if (!row) {
return true;
}
}
addRow(name, copyOf, row->value());
} else {