From 4a036a2daa015034a4135b91305aa0890b843fbc Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Sat, 28 Mar 2020 08:10:36 -0500 Subject: [PATCH] Grid: explicitly check for empty marker list (fixes: grid fails if no start+end markers yet) --- gtk2_ardour/editor.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index f455fa992d..fefcb7636c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2941,12 +2941,14 @@ Editor::snap_to_marker (samplepos_t presnap, RoundMode direction) samplepos_t after; samplepos_t test; + if (_session->locations()->list().empty()) { + /* No marks to snap to, so just don't snap */ + return test; + } + _session->locations()->marks_either_side (presnap, before, after); - if (before == max_samplepos && after == max_samplepos) { - /* No marks to snap to, so just don't snap */ - return presnap; - } else if (before == max_samplepos) { + if (before == max_samplepos) { test = after; } else if (after == max_samplepos) { test = before;