Revert "Merge Ω-W2-T4: split the deferred FX-park drain by kind"

This reverts commit 70bd29dc89, reversing
changes made to 84afd1b545.
This commit is contained in:
2026-08-03 17:46:17 -04:00
parent 4b19556513
commit 8487833342
7 changed files with 104 additions and 401 deletions
+4 -6
View File
@@ -26,7 +26,7 @@
#include "shell/capture/track_guid.h" // shared MediaTrack* -> canonical GUID key
#include "shell/panel/panel_window.h" // bankPanelInvalidate — footer toggle repaint
#include "shell/view/view.h" // applyMode + mintManagedLanes (D2 shell)
#include "shell/view/view_fx_park.h" // drainDeferredFxRestores — see persistViewState
#include "shell/view/view_fx_park.h" // drainDeferredFxParks — see persistViewState
#define REAPERAPI_MINIMAL
#define REAPERAPI_WANT_CountSelectedTracks
@@ -148,11 +148,9 @@ void persistViewState(PersistScope scope) {
// BEFORE the model is serialized, and before the Save-As below can write a
// .rpp: a deferred FX restore leaves the chain offline while the model has
// already dropped the snapshot that would replan it. Why that combination is
// unrecoverable on reopen is at drainDeferredFxRestores. Restores only — a
// pending PARK is safe to save over and converges on reopen. Runs for BOTH
// scopes: the narrowed save still writes the key the half-applied restore
// contradicts.
drainDeferredFxRestores();
// unrecoverable on reopen is at drainDeferredFxParks. Runs for BOTH scopes —
// the narrowed save still writes the key the half-applied park contradicts.
drainDeferredFxParks();
if (!g_session->view().membership().empty()) {
ReaProject* proj = EnumProjects(-1, nullptr, 0);