From 3a47d99f5f9050eaaa7c86acbc07c9346a9e85cc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 7 Jan 2015 19:51:18 -0500 Subject: [PATCH] Fix internal/external snap type restoration. --- gtk2_ardour/editor.cc | 7 ++++++- gtk2_ardour/editor.h | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 1c9af5af9d..b7ec7d43b2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -680,7 +680,6 @@ Editor::Editor () _snap_mode = SnapOff; set_snap_mode (_snap_mode); set_mouse_mode (MouseObject, true); - pre_internal_mouse_mode = MouseObject; pre_internal_snap_type = _snap_type; pre_internal_snap_mode = _snap_mode; internal_snap_type = _snap_type; @@ -2038,6 +2037,12 @@ Editor::set_snap_to (SnapType st) { unsigned int snap_ind = (unsigned int)st; + if (internal_editing()) { + internal_snap_type = st; + } else { + pre_internal_snap_type = st; + } + _snap_type = st; if (snap_ind > snap_type_strings.size() - 1) { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 43b3182c96..9261b01a7e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -572,7 +572,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_samples_per_pixel (framecnt_t); Editing::MouseMode mouse_mode; - Editing::MouseMode pre_internal_mouse_mode; Editing::SnapType pre_internal_snap_type; Editing::SnapMode pre_internal_snap_mode; Editing::SnapType internal_snap_type;