From 6b2785b625a251c16ce2be61fc4ec53bb4b709e0 Mon Sep 17 00:00:00 2001 From: David Bailes Date: Mon, 30 Sep 2019 12:57:31 +0100 Subject: [PATCH] Revert "Bug 2215: Cut does not work when in pause mode" This reverts commit 6a37cbae35da95b45f88d310a65b23064f3ed117. This was reverted because it caused bug 2221. --- src/Menus.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Menus.cpp b/src/Menus.cpp index e1f257514..aec5db531 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -655,14 +655,13 @@ bool MenuManager::TryToMakeActionAllowed( while ((flags & flagsRqd) != flagsRqd && iter != end) { const auto &enabler = *iter; auto actual = enabler.actualFlags(); - auto possible = enabler.possibleFlags(); auto MissingFlags = (~flags & flagsRqd); if ( // Do we have the right precondition? (flags & actual) == actual && // Can we get the condition we need? - (MissingFlags & possible) == possible + (MissingFlags & enabler.possibleFlags()) == MissingFlags ) { // Then try the function enabler.tryEnable( project, flagsRqd );