Skip to content

Commit

Permalink
Travis fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
CelticMinstrel committed Sep 10, 2017
1 parent 417ccdc commit c2598d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions src/hotkey/hotkey_command.hpp
Expand Up @@ -211,8 +211,6 @@ typedef std::bitset<SCOPE_COUNT> hk_scopes;
/// this is currently a semi struct: it haves a constructor, but only const-public members.
struct hotkey_command {
public:
/// the compiler want me to make a default constructor
/// since most member are const, calling the default constructor is normally no use.
hotkey_command() = delete;
hotkey_command(HOTKEY_COMMAND cmd, const std::string& id, const t_string& desc, bool hidden, bool toggle, hk_scopes scope, HOTKEY_CATEGORY category, const t_string& tooltip);
/// the names are strange: the "hotkey::HOTKEY_COMMAND" is named id, and the string to identify the object is called "command"
Expand Down
2 changes: 1 addition & 1 deletion src/hotkey/hotkey_item.cpp
Expand Up @@ -295,7 +295,7 @@ bool hotkey_keyboard::matches_helper(const SDL_Event &event) const

if ((event.type == SDL_KEYDOWN || event.type == SDL_KEYUP) &&
(mods & KMOD_CTRL || mods & KMOD_ALT || mods & KMOD_GUI ||
CKey::is_uncomposable(event.key)) || command.toggle) {
command.toggle || CKey::is_uncomposable(event.key))) {
return event.key.keysym.sym == keycode_ && mods == mod_;
}

Expand Down

0 comments on commit c2598d3

Please sign in to comment.