From 952a2f536b29644442f7ce86d651f81380f65dbb Mon Sep 17 00:00:00 2001 From: david-sway Date: Mon, 17 Jan 2022 16:05:22 -0500 Subject: [PATCH] Fixed string parsing logic for Quick Connect toolbar. --- mRemoteNG/Connection/ConnectionsService.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mRemoteNG/Connection/ConnectionsService.cs b/mRemoteNG/Connection/ConnectionsService.cs index d2d6750e9..95a19429e 100644 --- a/mRemoteNG/Connection/ConnectionsService.cs +++ b/mRemoteNG/Connection/ConnectionsService.cs @@ -80,17 +80,17 @@ namespace mRemoteNG.Connection { var x = connectionString.Split('@'); uriBuilder.UserName = x[0]; - uriBuilder.Host = x[1]; + connectionString = x[1]; } - if (uriBuilder.Host.Contains(":")) + if (connectionString.Contains(":")) { - var x = uriBuilder.Host.Split(':'); - uriBuilder.Host = x[0]; + var x = connectionString.Split(':'); + connectionString = x[0]; uriBuilder.Port = Convert.ToInt32(x[1]); } - else - uriBuilder.Host = connectionString; - + + uriBuilder.Host = connectionString; + var newConnectionInfo = new ConnectionInfo(); newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance); @@ -99,12 +99,17 @@ namespace mRemoteNG.Connection : uriBuilder.Host; newConnectionInfo.Protocol = protocol; + newConnectionInfo.Hostname = uriBuilder.Host; newConnectionInfo.Username = uriBuilder.UserName; if (uriBuilder.Port == -1) { newConnectionInfo.SetDefaultPort(); } + else + { + newConnectionInfo.Port = uriBuilder.Port; + } if (string.IsNullOrEmpty(newConnectionInfo.Panel)) newConnectionInfo.Panel = Language.General;