From ee47a1e08749accd4f2c8c65bc46bc3a2d9de601 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 13 Dec 2020 22:13:51 +0100 Subject: [PATCH] Fixed the manager's 'cancel' implementation: with this, redo of a cancelled operation isn't possible any more --- src/db/db/dbManager.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/db/db/dbManager.cc b/src/db/db/dbManager.cc index 5e53b1a83..0a9e24016 100644 --- a/src/db/db/dbManager.cc +++ b/src/db/db/dbManager.cc @@ -156,16 +156,14 @@ Manager::cancel () m_opened = false; if (m_current->first.begin () != m_current->first.end ()) { - ++m_current; undo (); - - } else { - // empty transactions .. just delete - erase_transactions (m_current, m_transactions.end ()); - m_current = m_transactions.end (); } + // wipe following history as we don't want the cancelled operation to be redoable + erase_transactions (m_current, m_transactions.end ()); + m_current = m_transactions.end (); + } }