Changeset 6427

Timestamp:

Dec 28, 2009, 8:35:54 PM (15 years ago)

Author:

rgrieder

Message:

Fixed (whyever it works now) bug in KeyBind menu that caused an error when removing a binding.
Also removed a GCC warning.

Location:

code/trunk

Files:

• data/gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• src/libraries/core/ConfigFileManager.h (modified) (1 diff)

code/trunk/data/gui/scripts/KeyBindMenu.lua

@@ -217 +217 @@
     local buttonNr = tonumber(match())
 
-    orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
+    local str = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr)
+    orxonox.KeyBinderManager:getInstance():unbind(str)
 
     P.callback()

code/trunk/src/libraries/core/ConfigFileManager.h

@@ -92 +92 @@
                 : name_(name)
                 , value_(value)
+                , additionalComment_(additionalComment)
                 , bString_(bString)
-                , additionalComment_(additionalComment)
                 { this->update(); }