smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix internal/external snap type restoration.

Browse source
This commit is contained in:
David Robillard 2015-01-07 19:51:18 -05:00
parent 84412e1367
commit 3a47d99f5f
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/editor.cc
View file

@ -680,7 +680,6 @@ Editor::Editor ()
_snap_mode = SnapOff; _snap_mode = SnapOff;
set_snap_mode (_snap_mode); set_snap_mode (_snap_mode);
set_mouse_mode (MouseObject, true); set_mouse_mode (MouseObject, true);
pre_internal_mouse_mode = MouseObject;
pre_internal_snap_type = _snap_type; pre_internal_snap_type = _snap_type;
pre_internal_snap_mode = _snap_mode; pre_internal_snap_mode = _snap_mode;
internal_snap_type = _snap_type; internal_snap_type = _snap_type;
@ -2038,6 +2037,12 @@ Editor::set_snap_to (SnapType st)
{ {
unsigned int snap_ind = (unsigned int)st; unsigned int snap_ind = (unsigned int)st;
if (internal_editing()) {
internal_snap_type = st;
} else {
pre_internal_snap_type = st;
}
_snap_type = st; _snap_type = st;
if (snap_ind > snap_type_strings.size() - 1) { if (snap_ind > snap_type_strings.size() - 1) {

1
gtk2_ardour/editor.h
View file

@ -572,7 +572,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void set_samples_per_pixel (framecnt_t); void set_samples_per_pixel (framecnt_t);
Editing::MouseMode mouse_mode; Editing::MouseMode mouse_mode;
Editing::MouseMode pre_internal_mouse_mode;
Editing::SnapType pre_internal_snap_type; Editing::SnapType pre_internal_snap_type;
Editing::SnapMode pre_internal_snap_mode; Editing::SnapMode pre_internal_snap_mode;
Editing::SnapType internal_snap_type; Editing::SnapType internal_snap_type;