[Orxonox-commit 2994] r7690 - code/trunk/data/gui/scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-12-01 15:21:11 +0100 (Wed, 01 Dec 2010)
New Revision: 7690

Modified:
   code/trunk/data/gui/scripts/GUITools.lua
   code/trunk/data/gui/scripts/MultiplayerMenu.lua
Log:
Adjusting some small thing that got forgotten while merging.


Modified: code/trunk/data/gui/scripts/GUITools.lua
===================================================================
--- code/trunk/data/gui/scripts/GUITools.lua	2010-12-01 14:00:19 UTC (rev 7689)
+++ code/trunk/data/gui/scripts/GUITools.lua	2010-12-01 14:21:11 UTC (rev 7690)
@@ -212,7 +212,7 @@
     end
     
     --enter
-    if code == "28" then
+    if code == "28" and P.index >= 0 then
         local item = list[P.index+1]
         local child = item["button"] 
         child:setProperty("NormalImageRightEdge", string.sub(child:getProperty("NormalImageRightEdge"),1,-10) .. "Normal")

Modified: code/trunk/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/MultiplayerMenu.lua	2010-12-01 14:00:19 UTC (rev 7689)
+++ code/trunk/data/gui/scripts/MultiplayerMenu.lua	2010-12-01 14:21:11 UTC (rev 7690)
@@ -10,13 +10,13 @@
     --button are arranged in a 2x2 matrix, the left lower item is nil
     local item = {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerJoinButton"),
-            ["function"]  = P.MultiplayerJoinButton2_clicked
+            ["function"]  = P.MultiplayerJoinButton_clicked
     }
     P.buttonList[1] = item
 
     local item = {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerHostButton"),
-            ["function"]  = P.MultiplayerHostButton2_clicked
+            ["function"]  = P.MultiplayerHostButton_clicked
     }
     P.buttonList[2] = item