Merge branch 'patch/6.0.4' into dev

modules/commands/interface.lua

@@ -29,12 +29,8 @@ end
 
 local interface_env = {} -- used as a persistent sandbox for interface commands
 local interface_callbacks = {} -- saves callbacks which can load new values per use
-Global.register({
-    interface_env = interface_env,
-    interface_callbacks = interface_callbacks
-},function(tbl)
-    interface_env = tbl.interface_env
-    interface_callbacks = tbl.interface_callbacks
+Global.register(interface_env,function(tbl)
+    interface_env = tbl
 end)
 
 --- Adds a callback function when the interface command is used

modules/gui/player-list.lua

@@ -128,6 +128,7 @@ end)
         local old_selected_player_name = Store.get(selected_player_store,player)
         if selected_player_name == old_selected_player_name then
             Store.clear(selected_player_store,player)
+            Store.clear(selected_action_store,player)
         else
             Store.set(selected_player_store,player,selected_player_name)
         end