From 6e01995f7ee631e5370d494bea66d59063c702f2 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 3 Oct 2026 11:19:30 +0000 Subject: [PATCH] fix(editor): a superseded export plan or estimate never replaces the current one Undo and redo bring back the same project instance, so a cancelled planning request passed the 'still current' check and published an empty plan (Render disabled) or blank preset estimates. Only requests that ran now publish. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC --- src/Titano.App/Editor/EditorViewModel.cs | 7 ++++++- src/Titano.App/Editor/ExportTab.cs | 5 ++++- tests/Titano.App.Tests/Editor/EditorSmokeTests.cs | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Titano.App/Editor/EditorViewModel.cs b/src/Titano.App/Editor/EditorViewModel.cs index 22d0dcf0..0559c9f3 100644 --- a/src/Titano.App/Editor/EditorViewModel.cs +++ b/src/Titano.App/Editor/EditorViewModel.cs @@ -577,19 +577,24 @@ public sealed class EditorViewModel : LocalizedViewModel, IAsyncDisposable private async Task RunPlanAsync(ExportPlanner planner, ProjectSettings project) { ExportPlan? plan = null; + // A superseded request ends quietly without planning; undo and redo bring back the very same project instance, + // so only a request that ran may publish (a failed plan publishes null: "nothing to render"). + var ran = false; try { await _plans.Schedule(_ => { plan = planner.Plan(project); + ran = true; return Task.CompletedTask; }); } catch (Exception ex) when (ex is ArgumentException or InvalidOperationException or RenderException) { Log.Warning("editor", "Planning the export failed", ex); + ran = true; } - if (_disposed || !ReferenceEquals(planner, Planner) || !ReferenceEquals(project, Session.Project)) return; + if (!ran || _disposed || !ReferenceEquals(planner, Planner) || !ReferenceEquals(project, Session.Project)) return; _planned = true; Plan = plan; OnPropertyChanged(nameof(RenderText)); diff --git a/src/Titano.App/Editor/ExportTab.cs b/src/Titano.App/Editor/ExportTab.cs index d536157d..2c6d3644 100644 --- a/src/Titano.App/Editor/ExportTab.cs +++ b/src/Titano.App/Editor/ExportTab.cs @@ -412,6 +412,7 @@ public sealed class ExportTab : EditorTab var project = Editor.Session.Project; var cards = Cards; var plans = new ExportPlan?[cards.Count]; + var done = false; try { await _estimates.Schedule(token => @@ -422,6 +423,7 @@ public sealed class ExportTab : EditorTab var export = project.Export with { Preset = project.Export.Preset.WithManual(cards[i].Choice.ExportPresetId), Overrides = new ExportOverrides(), Batch = [] }; plans[i] = Editor.Planner.Plan(project, export); } + done = true; return Task.CompletedTask; }); } @@ -430,7 +432,8 @@ public sealed class ExportTab : EditorTab Core.Diagnostics.Log.Warning("editor", "Preset estimates failed", ex); return; } - if (!ReferenceEquals(cards, Cards) || !ReferenceEquals(project, Editor.Session.Project)) return; + // A superseded request stops part way (or never starts); undo can bring back the same project instance. + if (!done || !ReferenceEquals(cards, Cards) || !ReferenceEquals(project, Editor.Session.Project)) return; for (var i = 0; i < cards.Count; i++) cards[i].Update(plans[i]); } diff --git a/tests/Titano.App.Tests/Editor/EditorSmokeTests.cs b/tests/Titano.App.Tests/Editor/EditorSmokeTests.cs index 1ff6d311..65353fc5 100644 --- a/tests/Titano.App.Tests/Editor/EditorSmokeTests.cs +++ b/tests/Titano.App.Tests/Editor/EditorSmokeTests.cs @@ -125,6 +125,7 @@ public sealed class EditorSmokeTests editor.RedoCommand.Execute(null); Assert.Equal(0.5, editor.Session.Project.Exposure.ExposureOffsetEv); await editor.Session.FlushAsync(); + Assert.True(await editor.WhenIdleAsync(TimeSpan.FromSeconds(60))); Assert.NotNull(editor.Plan, "the export is planned"); } finally