If we already have the display information for a VM, we can proceed
loading the correct console (noVNC or xtermjs).

This way, we don't need to wait for the callback of the VM's
status/current API call to finish setting up the console.

Signed-off-by: Aaron Lauterer <a.laute...@proxmox.com>
---
changes since v5:
* use new helper to check if serial

 www/manager6/VNCConsole.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/manager6/VNCConsole.js b/www/manager6/VNCConsole.js
index 3371c923..200145c0 100644
--- a/www/manager6/VNCConsole.js
+++ b/www/manager6/VNCConsole.js
@@ -67,6 +67,14 @@ Ext.define('PVE.noVncConsole', {
                activate: function() {
                    if (me.consoleType !== 'kvm') {
                        me.loadConsole(me.xtermjs, me.consoleType);
+                   } else {
+                       let display = me.up().statusStore.getById('display');
+                       if 
(PVE.Utils.isSerialDisplay(display?.data.value.type)) {
+                           me.xtermjs = true;
+                       }
+                       if (display) {
+                           me.loadConsole(me.xtermjs, me.consoleType);
+                       }
                    }
                },
            },
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to