npctrade closing trade and focusing window

modules/game_npctrade/npctrade.lua

@@ -201,9 +201,6 @@ end
 
 -- public functions
 function NPCTrade.init()
-  cacheItems = {}
-  cacheGoods = {}
-
   npcWindow = displayUI('npctrade.otui')
   npcWindow:setVisible(false)
 
@@ -292,6 +289,7 @@ function NPCTrade.show()
 
     npcWindow:show()
     npcWindow:raise()
+    npcWindow:focus()
   end
 end
 

modules/game_npctrade/npctrade.otui

@@ -33,8 +33,7 @@ MainWindow
   id: npcWindow
   !text: tr('NPC Trade')
   size: 550 515
-
+  @onEscape: g_game.closeNpcTrade()
-  @onEscape: NPCTrade.hide()
 
   TabButton
     id: buyTab
@@ -264,4 +263,4 @@ MainWindow
     width: 64
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-    @onClick: NPCTrade.hide()
+    @onClick: g_game.closeNpcTrade()