From fa07d414c63d2b4b66bc391563a276c2f0f2620a Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Wed, 4 May 2022 14:18:04 -0700
Subject: [PATCH] RDP integration fixes.

---
 apprelays.js             | 4 ++--
 views/default.handlebars | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apprelays.js b/apprelays.js
index efbf7850..28755265 100644
--- a/apprelays.js
+++ b/apprelays.js
@@ -114,7 +114,7 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
                         obj.relayActive = true; obj.relaySocket.resume();
                     } else {
                         obj.wsClient._socket.pause();
-                        try { obj.relaySocket.write(data, function () { obj.wsClient._socket.resume(); }); } catch (ex) { obj.close(); }
+                        try { obj.relaySocket.write(data, function () { try { obj.wsClient._socket.resume(); } catch (ex) { } }); } catch (ex) { obj.close(); }
                     }
                 });
                 obj.wsClient.on('close', function () { parent.parent.debug('relay', 'RDP: Relay websocket closed'); obj.close(); });
@@ -186,7 +186,7 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
             // Event node change if needed
             if (changed) {
                 // Event the node change
-                const event = { etype: 'node', action: 'changenode', nodeid: obj.nodeid, domain: domain.id, userid: obj.cookie.userid, node: parent.CloneSafeNode(node), msg: "Changed RDP credentials" };
+                const event = { etype: 'node', action: 'changenode', nodeid: obj.nodeid, domain: domain.id, userid: obj.userid, node: parent.CloneSafeNode(node), msg: "Changed RDP credentials" };
                 if (parent.parent.db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the node. Another event will come.
                 parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(node.meshid, [obj.nodeid]), obj, event);
             }
diff --git a/views/default.handlebars b/views/default.handlebars
index b6994969..25f5eea3 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -8588,7 +8588,7 @@
             if ((currentNode.rdp == 1) && (Q('d2mode').value == 1)) {
                 connectDesktop(null, 4, { servercred: true, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
             } else {
-                savecred = false;
+                var savecred = false;
                 if ((features2 & 0x00400000) == 0) { savecred = Q('d2savecred').checked; }
                 connectDesktop(null, 4, { domain: Q('d2domain').value, username: Q('d2user').value, password: Q('d2pass').value, savecred: savecred, width: width, height: height, flags: (desktopsettings.rdpflags != null) ? desktopsettings.rdpflags : 0x2F });
             }