Merge branch 'omega-w1-t1-mode-switch-responsiveness' into phase-omega

src/shell/actions/design_view_actions.cpp

@@ -26,6 +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"     // drainDeferredFxParks — see persistViewState
 
 #define REAPERAPI_MINIMAL
 #define REAPERAPI_WANT_CountSelectedTracks
@@ -144,6 +145,13 @@ enum class PersistScope { Full, ViewOnly };
 // the project is unsaved, prompts Save-As first (mirrors the flow capture uses) —
 // DAW-ONLY: Main_SaveProject(proj, true) blocks until the dialog is dismissed.
 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 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);
         if (proj) {