cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere)

This commit is contained in:
harrison 2014-03-23 18:11:42 -05:00 committed by Paul Davis
parent b5222012c0
commit c7d4ce1399
8 changed files with 107 additions and 188 deletions

View file

@ -1606,7 +1606,7 @@ Editor::parameter_changed (std::string p)
} else if (p == "show-region-fades") {
update_region_fade_visibility ();
} else if (p == "edit-mode") {
edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode()));
edit_mode_selector.set_text (edit_mode_to_string (Config->get_edit_mode()));
} else if (p == "show-track-meters") {
toggle_meter_updating();
} else if (p == "show-summary") {