ardour/livetrax
13
0
Fork 0
Code

ensure that dropdowns in editor toolbar are populated at first use (with no existing config file to set them)

Browse Source
This commit is contained in:
Paul Davis 2016-06-06 14:26:23 -04:00
parent 4e2efa22d5
commit 5833576d5b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/editor.cc
View File

@ -2375,6 +2375,8 @@ Editor::set_state (const XMLNode& node, int version)
if ((prop = node.property ("zoom-focus"))) { if ((prop = node.property ("zoom-focus"))) {
zoom_focus_selection_done ((ZoomFocus) string_2_enum (prop->value(), zoom_focus)); zoom_focus_selection_done ((ZoomFocus) string_2_enum (prop->value(), zoom_focus));
} else {
zoom_focus_selection_done (zoom_focus);
} }
if ((prop = node.property ("zoom"))) { if ((prop = node.property ("zoom"))) {
@ -2392,6 +2394,8 @@ Editor::set_state (const XMLNode& node, int version)
if ((prop = node.property ("snap-to"))) { if ((prop = node.property ("snap-to"))) {
snap_type_selection_done ((SnapType) string_2_enum (prop->value(), _snap_type)); snap_type_selection_done ((SnapType) string_2_enum (prop->value(), _snap_type));
set_snap_to ((SnapType) string_2_enum (prop->value(), _snap_type)); set_snap_to ((SnapType) string_2_enum (prop->value(), _snap_type));
} else {
set_snap_to (_snap_type);
} }
if ((prop = node.property ("snap-mode"))) { if ((prop = node.property ("snap-mode"))) {
@ -2401,6 +2405,8 @@ Editor::set_state (const XMLNode& node, int version)
* which does not trigger set_text(). * which does not trigger set_text().
*/ */
set_snap_mode ((SnapMode) string_2_enum (prop->value(), _snap_mode)); set_snap_mode ((SnapMode) string_2_enum (prop->value(), _snap_mode));
} else {
set_snap_mode (_snap_mode);
} }
if ((prop = node.property ("internal-snap-to"))) { if ((prop = node.property ("internal-snap-to"))) {
@ -2453,6 +2459,8 @@ Editor::set_state (const XMLNode& node, int version)
if ((prop = node.property ("edit-point"))) { if ((prop = node.property ("edit-point"))) {
set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true); set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
} else {
set_edit_point_preference (_edit_point);
} }
if ((prop = node.property ("show-measures"))) { if ((prop = node.property ("show-measures"))) {