From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 26 Mar 2012 06:03:54 +0000 (-0700)
Subject: Change "Connection does not exist" to more user-friendly error.
X-Git-Url: http://git.alex.org.uk

Change "Connection does not exist" to more user-friendly error.
---

diff --git a/src/main/resources/tunnel.js b/src/main/resources/tunnel.js
index 39709d8..87155eb 100644
--- a/src/main/resources/tunnel.js
+++ b/src/main/resources/tunnel.js
@@ -211,8 +211,20 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
         if (status == 0)   return "Disconnected";
         if (status == 200) return "Success";
         if (status == 403) return "Unauthorized";
-        if (status == 404) return "Connection does not exist";
-
+        if (status == 404) return "Connection closed"; /* While it may be more
+                                                        * accurate to say the
+                                                        * connection does not
+                                                        * exist, it is confusing
+                                                        * to the user.
+                                                        * 
+                                                        * In general, this error
+                                                        * will only happen when
+                                                        * the tunnel does not
+                                                        * exist, which happens
+                                                        * after the connection
+                                                        * is closed and the
+                                                        * tunnel is detached.
+                                                        */
         // Internal server errors
         if (status >= 500 && status <= 599) return "Server error";