From 9bfd2617e9e3de646991d38db593755a953a7dc8 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 12 Jul 2012 22:26:08 -0300
Subject: [PATCH] Fix some lua errors

---
 init.lua                         |  4 ----
 modules/client/client.lua        |  4 ++--
 modules/game_console/console.lua | 27 ++++++++++++++++-----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/init.lua b/init.lua
index 0bc3469e..ab16c91a 100644
--- a/init.lua
+++ b/init.lua
@@ -45,7 +45,3 @@ if g_resources.fileExists("/otclientrc.lua") then
   dofile("/otclientrc.lua")
 end
 
---g_things.loadOtb("/items.otb")
---g_map.loadOtbm("/forgotten.otbm")
-
-
diff --git a/modules/client/client.lua b/modules/client/client.lua
index 77884dca..5c909dfb 100644
--- a/modules/client/client.lua
+++ b/modules/client/client.lua
@@ -39,9 +39,9 @@ function Client.init()
   addEvent(function()
     scheduleEvent(function()
         -- Play startup music (The Silver Tree, by Mattias Westlund)
-        g_sounds.playMusic("startup.ogg", 3)
+        g_sounds.playMusic("/client/startup.ogg", 3)
         connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end })
-        connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end })
+        connect(g_game, { onGameEnd= function() g_sounds.playMusic("/client/startup.ogg", 3) end })
     end, 100)
   end, 0)
 end
diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
index 88ea66c4..1fbf6a60 100644
--- a/modules/game_console/console.lua
+++ b/modules/game_console/console.lua
@@ -189,22 +189,27 @@ local function onGameStart()
   local player = g_game.getLocalPlayer()
   if(player) then
     local char = player:getName()
-    
+
     local lastChannelsOpen = g_settings.getNode('LastChannelsOpen')
-    
+
     if(not table.empty(lastChannelsOpen) and lastChannelsOpen[char]) then
       for channelName, channelId in ipairs(lastChannelsOpen[char]) do
-        if(not table.find(channels, channelId)) then g_game.joinChannel(channelId) end
+        channelId = tonumber(channelId)
+        if channelId ~= 0 then
+          if not table.find(channels, channelId) then
+            g_game.joinChannel(channelId)
+          end
+        end
       end
     end
   end
-  
+
   local tab = Console.getTab(tr('Default'))
   if tab then
     --[[
       Known Issue: The server is calling to open channels after
       onGameStart is executed causing it to focus the last tab opened.
-      
+
       Fix: Don't save channels to the settings that are opened by the server.
     ]]
     addEvent(function() consoleTabBar:selectTab(tab) end, true)
@@ -221,27 +226,27 @@ end
 
 function Console.clear()
   local lastChannelsOpen = {}
-  
+
   local player = g_game.getLocalPlayer()
   if(player) then
     local char = player:getName()
     lastChannelsOpen[char] = {}
-    
+
     for channelId, channelName in pairs(channels) do
       table.insert(lastChannelsOpen[char], channelId)
     end
   end
-  
+
   -- save last open channels
   g_settings.setNode('LastChannelsOpen', lastChannelsOpen)
-  
+
   for _, channelName in pairs(channels) do
     local tab = consoleTabBar:getTab(channelName)
     consoleTabBar:removeTab(tab)
   end
-  
+
   channels = {}
-  
+
   consoleTabBar:getTab(tr('Default')).tabPanel:getChildById('consoleBuffer'):destroyChildren()
   consoleTabBar:getTab(tr('Server Log')).tabPanel:getChildById('consoleBuffer'):destroyChildren()