Fixed connection options, not sent unless needed.
Ylian Saint-Hilaire committed
Dec 16, 2019 at 10:39 UTC
528f24db1894d6ab6d8adb50722fc8b3afbaa5f4
2 files changed
+7
-3
agents/meshcore.js
+3
-1
@@ -1271,7 +1271,9 @@ function createMeshCore(agent) {
1271
// Look for a TSID
1272
var tsid = null;
1273
if ((this.httprequest.xoptions != null) && (typeof this.httprequest.xoptions.tsid == 'number')) { tsid = this.httprequest.xoptions.tsid; }
1274
- if (require('MeshAgent')._tsid != null) { tsid = require('MeshAgent')._tsid; }
1274
+ //if (require('MeshAgent')._tsid != null) { tsid = require('MeshAgent')._tsid; }
1275
+ //sendConsoleText('tsid: ' + tsid);
1276
+ //require('MeshAgent')._tsid = tsid;
1277
1278
// Remote desktop using native pipes
1279
this.httprequest.desktop = { state: 0, kvm: mesh.getRemoteDesktopStream(tsid), tunnel: this };
views/default.handlebars
+4
-2
@@ -1710,7 +1710,7 @@
1710
} else if ((message.type == 'userSessions') && (currentNode != null) && (currentNode._id == message.nodeid) && (desktop == null)) {
1711
// Got list of user sessions
1712
var userSessions = [];
1713
- if (message.data != null) { for (var i in message.data) { if ((message.data[i].State == 'Active') || (debugmode == 3)) { userSessions.push(message.data[i]); } } }
1713
+ if (message.data != null) { for (var i in message.data) { if ((message.data[i].State == 'Active') || (message.data[i].StationName == 'Console') || (debugmode == 3)) { userSessions.push(message.data[i]); } } }
1714
if (userSessions.length == 0) { connectDesktop(null, 1); } // No active sessions, do a normal connection.
1715
else if (userSessions.length == 1) { connectDesktop(null, 1, userSessions[0].SessionId); } // One active session, connect to it
1716
else {
@@ -5165,6 +5165,8 @@
5165
function autoConnectDesktop(e) { if (autoConnectDesktopTimer == null) { autoConnectDesktopTimer = setInterval(function() { connectDesktop(null, 1) }, 1000); } else { clearInterval(autoConnectDesktopTimer); autoConnectDesktopTimer = null; } }
5166
5167
function connectDesktop(e, contype, tsid) {
5168
+ if (xxdialogMode) return;
5169
+ if ((e != null) && (e.shiftKey == false) && (contype == 3)) { contype = 1; } // If the shift key is not pressed, don't try to ask for session list.
5170
QV('p11DeskSessionSelector', false);
5171
p11clearConsoleMsg();
5172
if (desktop == null) {
@@ -5259,7 +5261,7 @@
5261
desktop.debugmode = debugmode;
5262
desktop.m.debugmode = debugmode;
5263
desktop.attemptWebRTC = attemptWebRTC;
5262
- desktop.options = { tsid: tsid };
5264
+ if (tsid != null) { desktop.options = { tsid: tsid }; }
5265
desktop.onStateChanged = onDesktopStateChange;
5266
desktop.onConsoleMessageChange = function () {
5267
p11clearConsoleMsg();