Commit 2807378f authored by Dmitry Kazakov's avatar Dmitry Kazakov

Revert "Add a workaround for KisShortcutsMatcher assert"

The assert is already fixed in my other commits, so the workaround
is not needed anymore. Moreover it causes a hangup if the user presses
Delete key right in the middle of the brush stroke :(

This reverts commit 07167cd2.
parent 8bfeb51a
......@@ -585,25 +585,16 @@ bool KisTool::overrideCursorIfNotEditable()
bool KisTool::blockUntilOperationsFinished()
{
// we cannot show any dialogs in the tool's code,
// it can make KisShortcutsMatcher crazy
image()->waitForDone();
return true;
// KisCanvas2 * kiscanvas = static_cast<KisCanvas2*>(canvas());
// KisViewManager* viewManager = kiscanvas->viewManager();
// return viewManager->blockUntilOperationsFinished(image());
KisCanvas2 * kiscanvas = static_cast<KisCanvas2*>(canvas());
KisViewManager* viewManager = kiscanvas->viewManager();
return viewManager->blockUntilOperationsFinished(image());
}
void KisTool::blockUntilOperationsFinishedForced()
{
// we cannot show any dialogs in the tool's code,
// it can make KisShortcutsMatcher crazy
image()->waitForDone();
// KisCanvas2 * kiscanvas = static_cast<KisCanvas2*>(canvas());
// KisViewManager* viewManager = kiscanvas->viewManager();
// viewManager->blockUntilOperationsFinishedForced(image());
KisCanvas2 * kiscanvas = static_cast<KisCanvas2*>(canvas());
KisViewManager* viewManager = kiscanvas->viewManager();
viewManager->blockUntilOperationsFinishedForced(image());
}
bool KisTool::isActive() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment