[aseprite] 22/134: Minor change in KeyItem::restoreKeys() logic
Tobias Hansen
thansen at moszumanska.debian.org
Sat Mar 14 17:09:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit d39397f4d1746572eba6930d3cc5b5cb17023ea6
Author: David Capello <davidcapello at gmail.com>
Date: Wed Oct 29 23:50:58 2014 -0300
Minor change in KeyItem::restoreKeys() logic
---
src/app/commands/cmd_keyboard_shortcuts.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index 1b365d6..25c519b 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -71,12 +71,11 @@ public:
}
void restoreKeys() {
- if (m_key) {
- if (m_keyOrig)
- *m_key = *m_keyOrig;
- else if (m_menuitem)
- m_menuitem->setKey(NULL);
- }
+ if (m_key && m_keyOrig)
+ *m_key = *m_keyOrig;
+
+ if (m_menuitem && !m_keyOrig)
+ m_menuitem->setKey(NULL);
}
private:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list