summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-01-07 19:51:18 -0500
committerDavid Robillard <d@drobilla.net>2015-01-07 19:51:18 -0500
commit3a47d99f5f9050eaaa7c86acbc07c9346a9e85cc (patch)
tree3a006885f8fef7f74c97867741cb86c8890e2596 /gtk2_ardour/editor.cc
parent84412e1367b2432aadb6ce996b6c15d2846aadca (diff)
Fix internal/external snap type restoration.
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc7
1 files changed, 6 insertions, 1 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) {