From e8427ee2cb31e91fce54461056c6a430bb74add1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 17 Aug 2016 19:22:15 -0400 Subject: GUI does an even stronger check on no undo/redo while recording --- gtk2_ardour/editor_ops.cc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e5d762332e..f7bbf2a166 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -119,6 +119,13 @@ using Gtkmm2ext::Keyboard; void Editor::undo (uint32_t n) { + if (_session && _session->actively_recording()) { + /* no undo allowed while recording. Session will check also, + but we don't even want to get to that. + */ + return; + } + if (_drags->active ()) { _drags->abort (); } @@ -136,12 +143,19 @@ Editor::undo (uint32_t n) void Editor::redo (uint32_t n) { + if (_session && _session->actively_recording()) { + /* no redo allowed while recording. Session will check also, + but we don't even want to get to that. + */ + return; + } + if (_drags->active ()) { _drags->abort (); } if (_session) { - _session->redo (n); + _session->redo (n); if (_session->redo_depth() == 0) { redo_action->set_sensitive(false); } -- cgit v1.2.3