Handle if desktopName isn't set when connected

We can't guarantee that the desktopName event has been fired before the
connect event.

2 files changed, 17 insertions, 5 deletions

diff --git a/app/ui.js b/app/ui.js
index c03f8d3..045c64f 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1074,10 +1074,14 @@ const UI = {
         UI.inhibit_reconnect = false;
 
         let msg;
-        if (UI.getSetting('encrypt')) {
-            msg = _("Connected (encrypted) to ") + UI.desktopName;
+        if (UI.desktopName !== '') {
+            if (UI.getSetting('encrypt')) {
+                msg = _("Connected (encrypted) to ") + UI.desktopName;
+            } else {
+                msg = _("Connected (unencrypted) to ") + UI.desktopName;
+            }
         } else {
-            msg = _("Connected (unencrypted) to ") + UI.desktopName;
+            msg = _("Connected");
         }
         UI.showStatus(msg);
         UI.updateVisualState('connected');
diff --git a/vnc_lite.html b/vnc_lite.html
index e5ab3c2..9f766fb 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -131,11 +131,19 @@
 
         function connected(e) {
             document.getElementById('sendCtrlAltDelButton').disabled = false;
+
+            let encryption;
             if (WebUtil.getConfigVar('encrypt',
                                      (window.location.protocol === "https:"))) {
-                status("Connected (encrypted) to " + desktopName, "normal");
+                encryption = "unencrypted";
+            } else {
+                encryption = "encrypted";
+            }
+
+            if (desktopName) {
+                status("Connected (" + encryption + ") to " + desktopName, "normal");
             } else {
-                status("Connected (unencrypted) to " + desktopName, "normal");
+                status("Connected (" + encryption + ")", "normal");
             }
         }