Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Nov 1, 2024

Fixes #11980

Proposed changes

  • fix(FormDiff): Separate CancellationTokenSequences of PopulateDiffFiles and ShowSelectedFileDiff
    necessary because ShowSelectedFileDiff is called twice before PopulateDiffFiles finishes

Screenshots

Before

exception

After

works

Test methodology

  • manual (compare commit e283787 with working dir)

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

of PopulateDiffFiles and ShowSelectedFileDiff
@mstv mstv self-assigned this Nov 1, 2024
@mstv mstv merged commit 395bdf7 into gitextensions:master Nov 3, 2024
4 checks passed
@mstv mstv deleted the fix/11980_formdiff_async branch November 3, 2024 20:49
@RussKie RussKie added this to the 5.1 milestone Nov 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[NBug] One or more errors occurred. (A task was canceled.)
2 participants