MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 06:35:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

refix #6240 as switching devices keep session open by mistake

Browse Source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-09-10 13:31:15 +01:00
parent 1d04a13a64
commit 21206b670c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
views/default.handlebars
View File

@ -9038,7 +9038,11 @@
var desktopNode;
function setupDesktop() {
// Setup the remote desktop
//if ((desktopNode != currentNode) && (desktop != null)) { desktop.Stop(); desktopNode = null; desktop = null; }
if ((desktopNode != currentNode) && (desktop != null)) {
if (desktopNode._id != currentNode._id) {
desktop.Stop(); desktopNode = null; desktop = null;
}
}
// If the device desktop is already connected in multi-desktop, use that.
if ((desktopNode != currentNode) || (desktop == null)) {
@ -10500,7 +10504,11 @@
var terminalNode;
function setupTerminal() {
// Setup the terminal
//if ((terminalNode != currentNode) && (terminal != null)) { terminal.Stop(); terminal = null; }
if ((terminalNode != currentNode) && (terminal != null)) {
if (terminalNode._id != currentNode._id) {
terminal.Stop(); terminalNode = null; terminal = null;
}
}
terminalNode = currentNode;
updateTerminalButtons();
}
@ -10953,6 +10961,11 @@
var filesNode;
function setupFiles() {
// Setup the files tab
if ((filesNode != currentNode) && (files != null)) {
if (filesNode._id != currentNode._id) {
files.Stop(); filesNode = null; files = null;
}
}
var samenode = (filesNode == currentNode);
filesNode = currentNode;
var online = ((filesNode.conn & 1) != 0) || (filesNode.mtype == 3); // If Agent (1) connected, enable Terminal
@ -10961,7 +10974,6 @@
QV('p13Connect', (files == null) && (filesNode.mtype == 2));
QV('p13Connects', ((features2 & 0x200) != 0) && (filesNode.agent != null) && (filesNode.agent.id != 3) && (filesNode.agent.id != 4) && ((features2 & 0x800000) == 0));
QV('p13Disconnect', files != null);
//if (((samenode == false) || (online == false)) && files) { files.Stop(); files = null; }
p13setActions();
}