From: Brian P. Hinz <bphinz@users.sf.net>
Date: Sat, 6 May 2017 15:24:11 +0000 (-0400)
Subject: Set gateway host correctly when -via is used
X-Git-Tag: v1.8.90~154
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04dd70e28187a2d9b90092349defcb64e37e87ac;p=tigervnc.git

Set gateway host correctly when -via is used
---

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 {