Topmenu fix

* Will no longer duplicate topmenu buttons (no need to destroy in the module now)
* Menu items will no longer change position when reloaded.

modules/client_entergame/entergame.lua

@@ -136,17 +136,11 @@ function EnterGame.terminate()
   removeEvent(autoLoginEvent)
   enterGame:destroy()
   enterGame = nil
-  enterGameButton:destroy()
-  enterGameButton = nil
   protocolBox = nil
   if motdWindow then
     motdWindow:destroy()
     motdWindow = nil
   end
-  if motdButton then
-    motdButton:destroy()
-    motdButton = nil
-  end
   if loadBox then
     loadBox:destroy()
     loadBox = nil

modules/client_modulemanager/modulemanager.lua

@@ -23,8 +23,6 @@ end
 function terminate()
   moduleManagerWindow:destroy()
   moduleManagerWindow = nil
-  moduleManagerButton:destroy()
-  moduleManagerButton = nil
   moduleList = nil
 end
 

modules/client_options/options.lua

@@ -119,15 +119,11 @@ function terminate()
   g_keyboard.unbindKeyDown('Ctrl+Shift+F')
   optionsWindow:destroy()
   optionsWindow = nil
-  optionsButton:destroy()
-  optionsButton = nil
   optionsTabBar = nil
   generalPanel = nil
   consolePanel = nil
   graphicsPanel = nil
   audioPanel = nil
-  audioButton:destroy()
-  audioButton = nil
 end
 
 function toggle()

modules/client_terminal/terminal.lua

@@ -150,8 +150,6 @@ function terminate()
   g_settings.setList('terminal-history', commandHistory)
   g_keyboard.unbindKeyDown('Ctrl+T')
   g_logger.setOnLog(nil)
-  terminalButton:destroy()
-  terminalButton = nil
   commandTextEdit = nil
   terminalBuffer = nil
   terminalWindow:destroy()

modules/client_topmenu/topmenu.lua

@@ -14,11 +14,14 @@ local function addButton(id, description, icon, callback, panel, toggle, front)
     class = 'TopButton'
   end
 
-  local button = g_ui.createWidget(class)
+  local button = panel:getChildById(id)
-  if front then
+  if not button then
-    panel:insertChild(1, button)
+    button = g_ui.createWidget(class)
-  else
+    if front then
-    panel:addChild(button)
+      panel:insertChild(1, button)
+    else
+      panel:addChild(button)
+    end
   end
   button:setId(id)
   button:setTooltip(description)

modules/game_combatcontrols/combatcontrols.lua

@@ -50,7 +50,6 @@ function terminate()
   end
 
   fightModeRadioGroup:destroy()
-  combatControlsButton:destroy()
   combatControlsWindow:destroy()
 
   disconnect(g_game, {

modules/game_cooldown/cooldown.lua

@@ -35,7 +35,6 @@ function terminate()
                        onSpellGroupCooldown = onSpellGroupCooldown,
                        onSpellCooldown = onSpellCooldown })
 
-  cooldownButton:destroy()
   cooldownWindow:destroy()
 end
 

modules/game_healthinfo/healthinfo.lua

@@ -70,7 +70,6 @@ function terminate()
   disconnect(g_game, { onGameEnd = offline })
 
   healthInfoWindow:destroy()
-  healthInfoButton:destroy()
   healthInfoWindow = nil
   healthInfoButton = nil
 

modules/game_hotkeys/hotkeys_manager.lua

@@ -88,7 +88,6 @@ function terminate()
   unload()
 
   hotkeysWindow:destroy()
-  hotkeysButton:destroy()
   mouseGrabberWidget:destroy()
 end
 

modules/game_interface/gameinterface.lua

@@ -123,7 +123,6 @@ function terminate()
 
   disconnect(gameLeftPanel, { onVisibilityChange = onLeftPanelVisibilityChange })
 
-  logoutButton:destroy()
   gameRootPanel:destroy()
 end
 

modules/game_inventory/inventory.lua

@@ -39,7 +39,6 @@ function terminate()
   g_keyboard.unbindKeyDown('Ctrl+I')
 
   inventoryWindow:destroy()
-  inventoryButton:destroy()
 end
 
 function refresh()

modules/game_minimap/minimap.lua

@@ -48,7 +48,6 @@ function terminate()
   g_keyboard.unbindKeyPress('Alt+Down', gameRootPanel)
   g_keyboard.unbindKeyDown('Ctrl+M')
 
-  minimapButton:destroy()
   minimapWindow:destroy()
 end
 

modules/game_questlog/questlog.lua

@@ -17,9 +17,6 @@ function terminate()
                        onQuestLine = onGameQuestLine,
                        onGameEnd = destroyWindows})
 
-  if questLogButton then
-    questLogButton:destroy()
-  end
   destroyWindows()
 end
 

modules/game_skills/skills.lua

@@ -60,7 +60,6 @@ function terminate()
   })
 
   g_keyboard.unbindKeyDown('Ctrl+S')
-  skillsButton:destroy()
   skillsWindow:destroy()
 end
 

modules/game_spelllist/spelllist.lua

@@ -172,8 +172,6 @@ function terminate()
                           updateSpellInformation(focusedChild)
                         end })   
 
-  spelllistButton:destroy()
-  spelllistButton       = nil
   spelllistWindow:destroy()
   spelllistWindow       = nil