[aseprite] 75/134: Fix #543 crash adding keyboard shortcuts to menu items without associated app::Key

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 8514f02ee46770e175d6d633445a5c8f57856f57
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Nov 25 20:06:48 2014 -0300

    Fix #543 crash adding keyboard shortcuts to menu items without associated app::Key
---
 src/app/commands/cmd_keyboard_shortcuts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index 3c366e3..1036334 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -107,7 +107,7 @@ private:
 
   void onAddAccel() {
     ui::Accelerator accel;
-    SelectAccelerator window(accel, m_key->keycontext());
+    SelectAccelerator window(accel, m_key ? m_key->keycontext(): KeyContext::Any);
     window.openWindowInForeground();
 
     if (window.isModified()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git