smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 06:35:46 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Bug fix: Toggling state of MIDI Marker, should reset selection from selected Skip Marker if any. Checking for front of _editor->selection-markers should not be done when _editor->selection-markers is empty.

Browse source
This commit is contained in:
Valeriy Kamyshniy 2015-02-16 15:08:46 +02:00
parent 37a956975b
commit 9257e99d49
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/editor_drag.cc
View file

@ -3417,7 +3417,8 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
// Range Markers should not be multiselected.
// There must not be any Range Marker in any multi-selection
if ((_marker->type () == Marker::Range) ||
(_editor->selection->markers.front ()->type () == Marker::Range)) {
((!_editor->selection->markers.empty()) &&
(_editor->selection->markers.front ()->type () == Marker::Range))) {
if (!_editor->selection->selected (_marker)) {
_editor->selection->set (_marker);
}
@ -3690,7 +3691,14 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
break;
case Selection::Toggle:
/* we toggle on the button release, click only */
// Range Markers should not be multiselected.
// There must not be any Range Marker in any multi-selection
if ((_marker->type () == Marker::Mark) &&
(!_editor->selection->markers.empty()) &&
(_editor->selection->markers.front ()->type () == Marker::Range)) {
_editor->selection->markers.clear ();
}
_editor->selection->toggle (_marker);
break;