Merge branch 'hotfix/3.5.4'

This commit is contained in:
patrick96 2021-01-07 13:52:28 +01:00
commit 74dcb4649d
No known key found for this signature in database
GPG key ID: 521E5E03AEBCA1A7
3 changed files with 9 additions and 13 deletions
src/components

View file

@ -664,16 +664,7 @@ bool controller::process_update(bool force) {
block_contents += padding_right;
}
// Strip unnecessary reset tags
block_contents = string_util::replace_all(block_contents, "T-}%{T", "T");
block_contents = string_util::replace_all(block_contents, "B-}%{B#", "B#");
block_contents = string_util::replace_all(block_contents, "F-}%{F#", "F#");
block_contents = string_util::replace_all(block_contents, "U-}%{U#", "U#");
block_contents = string_util::replace_all(block_contents, "u-}%{u#", "u#");
block_contents = string_util::replace_all(block_contents, "o-}%{o#", "o#");
// Join consecutive tags
contents += string_util::replace_all(block_contents, "}%{", " ");
contents += block_contents;
}
try {