Skip to content

[stable-33.0] fix(common): preserve Windows Explorer custom folder icons during migration. - #10133

Merged
mgallien merged 1 commit into
stable-33.0from
backport/9872/stable-33.0
Jun 9, 2026
Merged

[stable-33.0] fix(common): preserve Windows Explorer custom folder icons during migration.#10133
mgallien merged 1 commit into
stable-33.0from
backport/9872/stable-33.0

Conversation

@backportbot

@backportbot backportbot Bot commented Jun 9, 2026

Copy link
Copy Markdown

Backport of PR #9872

…ration.

Check the encoding of the Desktop.ini file to determine if it should be
overwritten or preserved:
- Windows Explorer writes Desktop.ini in UTF-16LE (custom icon),
- While the client always writes UTF-8 (default icon).

Fixes the regression introduced by d60c760.

Signed-off-by: Camila Ayres <hello@camilasan.com>
@backportbot
backportbot Bot requested review from Aiiaiiio, camilasan and i2h3 as code owners June 9, 2026 13:20
@backportbot
backportbot Bot requested a review from mgallien June 9, 2026 13:20
@backportbot
backportbot Bot requested review from mgallien and nilsding as code owners June 9, 2026 13:20
@backportbot backportbot Bot added this to the 33.0.6 milestone Jun 9, 2026
@mgallien
mgallien enabled auto-merge June 9, 2026 13:25
@mgallien
mgallien merged commit b6739f0 into stable-33.0 Jun 9, 2026
15 of 17 checks passed
@mgallien
mgallien deleted the backport/9872/stable-33.0 branch June 9, 2026 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants