diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-25 09:26:35 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-25 09:26:35 -0500 |
| commit | fa22520fd257f166c00615e7e40ec10c9e29b948 (patch) | |
| tree | 7c4cb225fb66306001db6f60d01aecfcfd91d2ef /gtk2_ardour/ardour_ui_options.cc | |
| parent | 0cca2724311b8df9989dc46efad12bdbe05c3883 (diff) | |
| parent | f1db14923e5d14331d1bf869d32862a2cf3460bb (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/ardour_ui_options.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index ed2c177091..22f88114d9 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -404,11 +404,13 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-editor-meter") { bool show = Config->get_show_editor_meter(); if (editor_meter && show) { + transport_tearoff_hbox.pack_start (meter_box, false, false); + transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); meter_box.show(); editor_meter_peak_display.show(); - } else if (editor_meter && !show) { - meter_box.hide(); - editor_meter_peak_display.hide(); + } else if (editor_meter && !show && meter_box.get_parent()) { + transport_tearoff_hbox.remove (meter_box); + transport_tearoff_hbox.remove (editor_meter_peak_display); } } } |