From 04dd70e28187a2d9b90092349defcb64e37e87ac Mon Sep 17 00:00:00 2001
From: "Brian P. Hinz" <bphinz@users.sf.net>
Date: Sat, 6 May 2017 11:24:11 -0400
Subject: [PATCH] Set gateway host correctly when -via is used

---
 java/com/tigervnc/vncviewer/Tunnel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/tigervnc/vncviewer/Tunnel.java b/java/com/tigervnc/vncviewer/Tunnel.java
index bb98ec7c..8d083f8e 100644
--- a/java/com/tigervnc/vncviewer/Tunnel.java
+++ b/java/com/tigervnc/vncviewer/Tunnel.java
@@ -58,7 +58,7 @@ public class Tunnel {
     String remoteHost;
 
     remotePort = cc.getServerPort();
-    if (tunnel.getValue()) {
+    if (tunnel.getValue() && via.getValue().isEmpty()) {
       gatewayHost = cc.getServerName();
       remoteHost = "localhost";
     } else {
-- 
2.39.5