better fix for mouse mode = range crash on marker bar click

This commit is contained in:
Paul Davis 2014-11-26 12:47:23 +02:00
parent f8e606fea7
commit c0b50a4768

View file

@ -669,6 +669,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MarkerBarItem: case MarkerBarItem:
_drags->set (new MarkerBarDrag (this, item), event); _drags->set (new MarkerBarDrag (this, item), event);
return true;
break; break;
case SkipBarItem: case SkipBarItem:
@ -740,6 +741,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
eff = MouseObject; eff = MouseObject;
} }
cerr << "item type " << enum_2_string (item_type) << endl;
switch (eff) { switch (eff) {
case MouseRange: case MouseRange:
switch (item_type) { switch (item_type) {
@ -807,10 +810,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
} }
break; break;
case MarkerBarItem:
/* do nothing */
break;
default: default:
if (!internal_editing()) { if (!internal_editing()) {
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {