Skip to content

Do not apply cancelled decompilation output #4165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siegfriedpammer wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

Do not apply cancelled decompilation output #4165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ILSpy/TextView/DecompilerTabPageModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,13 @@ async Task DecompileAsync()
ICSharpCode.ILSpy.AppEnv.AppLog.Mark($"DecompileAsync #{callNumber}: {rendered.Length} chars, {(output.Foldings?.Count ?? 0)} foldings, {(output.References?.Count ?? 0)} refs");
using (ICSharpCode.ILSpy.AppEnv.AppLog.Phase($"DecompileAsync #{callNumber}: Dispatcher.InvokeAsync (apply Text + props, triggers ApplyDocument)"))
await Dispatcher.UIThread.InvokeAsync(() => {
// Re-check on the UI thread, not just before rendering: collecting the text
// and waiting for this callback both take time, and a cancel that lands in
// that window (the assembly was removed from the list, the user selected
// something else) must not let the finished output overwrite whatever state
// the tab has been put into since.
if (cts.Token.IsCancellationRequested)
return;
Title = cachedBaseTitle;
ApplyOutput(output, effectiveSyntaxExtension, rendered);
});
Expand Down
Loading