From 6760a06d097cf4afda2a0d5411d4d69711a571c3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 2 Apr 2024 17:57:26 -0600 Subject: [PATCH] do not save or restore tabbable state for livetrax --- gtk2_ardour/editor.cc | 8 ++++++-- gtk2_ardour/mixer_ui.cc | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c8c29db521..8782e52a7f 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2528,7 +2528,9 @@ Editor::set_state (const XMLNode& node, int version) PBD::Unwinder nsi (no_save_instant, true); bool yn; - Tabbable::set_state (node, version); + if (!Profile->get_livetrax()) { + Tabbable::set_state (node, version); + } samplepos_t ph_pos; if (_session && node.get_property ("playhead", ph_pos)) { @@ -2746,7 +2748,9 @@ Editor::get_state () const node->set_property ("id", id().to_s ()); - node->add_child_nocopy (Tabbable::get_state()); + if (!Profile->get_livetrax()) { + node->add_child_nocopy (Tabbable::get_state()); + } node->set_property("edit-horizontal-pane-pos", edit_pane.get_divider ()); node->set_property("notebook-shrunk", _notebook_shrunk); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index b9f53f7ea5..c0ca9d3281 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -2560,7 +2560,9 @@ Mixer_UI::set_state (const XMLNode& node, int version) { bool yn; - Tabbable::set_state (node, version); + if (!Profile->get_livetrax()) { + Tabbable::set_state (node, version); + } if (node.get_property ("narrow-strips", yn)) { if (yn) { @@ -2704,7 +2706,9 @@ Mixer_UI::get_state () const { XMLNode* node = new XMLNode (X_("Mixer")); - node->add_child_nocopy (Tabbable::get_state()); + if (!Profile->get_livetrax()) { + node->add_child_nocopy (Tabbable::get_state()); + } node->set_property (X_("mixer-rhs-pane1-pos"), rhs_pane1.get_divider()); node->set_property (X_("mixer-rhs_pane2-pos"), rhs_pane2.get_divider());