[Orxonox-commit 1709] r6427 - in code/trunk: data/gui/scripts src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-28 20:35:54 +0100 (Mon, 28 Dec 2009)
New Revision: 6427

Modified:
   code/trunk/data/gui/scripts/KeyBindMenu.lua
   code/trunk/src/libraries/core/ConfigFileManager.h
Log:
Fixed (whyever it works now) bug in KeyBind menu that caused an error when removing a binding.
Also removed a GCC warning.

Modified: code/trunk/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/KeyBindMenu.lua	2009-12-28 09:08:12 UTC (rev 6426)
+++ code/trunk/data/gui/scripts/KeyBindMenu.lua	2009-12-28 19:35:54 UTC (rev 6427)
@@ -216,7 +216,8 @@
     local commandNr = tonumber(match())
     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()
 end

Modified: code/trunk/src/libraries/core/ConfigFileManager.h
===================================================================
--- code/trunk/src/libraries/core/ConfigFileManager.h	2009-12-28 09:08:12 UTC (rev 6426)
+++ code/trunk/src/libraries/core/ConfigFileManager.h	2009-12-28 19:35:54 UTC (rev 6427)
@@ -91,8 +91,8 @@
             inline ConfigFileEntryValue(const std::string& name, const std::string& value = "", bool bString = false, const std::string& additionalComment = "")
                 : name_(name)
                 , value_(value)
+                , additionalComment_(additionalComment)
                 , bString_(bString)
-                , additionalComment_(additionalComment)
                 { this->update(); }
 
             inline virtual ~ConfigFileEntryValue() {}