diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-07-02 05:35:27 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-07-10 02:18:37 +1000 |
| commit | 39b70ceced2635358030b373a6e14a44e81b3816 (patch) | |
| tree | 09f46b842572e892afe579787e936a067f2f37fe /gtk2_ardour/editor_drag.cc | |
| parent | 180445c18c58232bcb6f874a6c6e63a50cf3aacd (diff) | |
Check meter/tempo section exists in copy drag.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 212c02513f..cb4de0cf7c 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3189,6 +3189,10 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) const double beat = map.beat_at_bbt (bbt); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style()); + if (!_real_section) { + aborted (true); + return; + } } /* only snap to bars. leave snap mode alone for audio locked meters.*/ @@ -3329,6 +3333,11 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) } else { _real_section = map.add_tempo (_marker->tempo(), 0.0, frame, _real_section->type(), AudioTime); } + + if (!_real_section) { + aborted (true); + return; + } } } |