Merge branch 'master' of https://github.com/WagicProject/wagic into cmake

2017-09-02 21:15:47 +02:00
parent 2b342ca33b 07e6d90c98
commit 15111d1b20
541 changed files with 95355 additions and 35840 deletions
@@ -249,6 +249,7 @@ u32 JGE::BindKey(LocalKeySym sym, JButton button)
 u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
 {
    for (keycodes_it it = keyBinds.begin(); it != keyBinds.end(); )
+    {
        if (sym == it->first && button == it->second)
        {
            keycodes_it er = it;
@@ -256,7 +257,8 @@ u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
            keyBinds.erase(er);
        }
        else ++it;
-        return keyBinds.size();
+    }
+    return keyBinds.size();
 }

 u32 JGE::UnbindKey(LocalKeySym sym)