diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-17 08:21:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:42 -0400 |
| commit | 2c9c2102138f20e32545f8bda7d1dc72587663e8 (patch) | |
| tree | 5fc48fa8131d7b10dda47cd3c1eb97d5cf72b36a /gtk2_ardour/ardour_ui_ed.cc | |
| parent | 4b0a235f91c43a0011b2bc466a910c5b015560e0 (diff) | |
manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 2ca83ca7bf..08529bbe0e 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -705,8 +705,6 @@ ARDOUR_UI::save_ardour_state () current_tab = "mixer"; } else if (current_page_number == _tabs.page_num (rc_option_editor->contents())) { current_tab = "preferences"; - } else if (masters && (current_page_number == _tabs.page_num (masters->contents()))) { - current_tab == "masters"; } main_window_node.add_property (X_("current-tab"), current_tab); |