From 63452b7bc831dede3173e45172377e0ca434bbe0 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 16 Jun 2021 21:59:34 -0700 Subject: [PATCH] GUACAMOLE-724: Automatically focus the first client if no client has yet been focused. --- .../main/frontend/src/app/client/services/guacClientManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/frontend/src/app/client/services/guacClientManager.js b/guacamole/src/main/frontend/src/app/client/services/guacClientManager.js index 5c70fb3dc..b1817a0dd 100644 --- a/guacamole/src/main/frontend/src/app/client/services/guacClientManager.js +++ b/guacamole/src/main/frontend/src/app/client/services/guacClientManager.js @@ -232,7 +232,8 @@ angular.module('client').factory('guacClientManager', ['$injector', clients.push(service.getManagedClient(id)); }); - if (clients.length === 1) { + // Focus the first client if there are no clients focused + if (clients.length >= 1 && _.findIndex(clients, client => client.clientProperties.focused) === -1) { clients[0].clientProperties.focused = true; }