From 6ca76c0ca9fca223557ab7601f9839a11609d170 Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 27 Sep 2017 12:29:12 -0300 Subject: [PATCH] macOS: Fix crash undoing/redoing action while we're drawing Fix this issue: https://community.aseprite.org/t/crash-when-i-use-undo/494 --- src/app/app_menus.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app_menus.cpp b/src/app/app_menus.cpp index 797c974b3..6259fc063 100644 --- a/src/app/app_menus.cpp +++ b/src/app/app_menus.cpp @@ -93,6 +93,8 @@ static bool can_call_global_shortcut(const she::Shortcut& shortcut) ASSERT(manager); ui::Widget* focus = manager->getFocus(); return + // The mouse is not capture + (manager->getCapture() == nullptr) && // The foreground window must be the main window to avoid calling // a global command inside a modal dialog. (manager->getForegroundWindow() == App::instance()->mainWindow()) &&