diff options
author | Dimitrij <kvarkas@gmail.com> | 2022-01-19 22:41:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 22:41:05 +0300 |
commit | 92c3c967ba62d6e5b4a4e95ecad9014c9c72ae28 (patch) | |
tree | 6579a371e746e54bd7fd33445ec8c7c1aec55237 | |
parent | 5cfdc96cd2a3cb48b5d793eb826ed7aeee2440bc (diff) | |
parent | c632ba4306c97403ae60f9d7bee44b71bfeaf902 (diff) |
Merge pull request #2138 from ThoGoetz/v1.77.3-dev
Improve compatibility with Remote Desktop Connection Manager v2.83
-rw-r--r-- | mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index 63b67222..43ce5977 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -57,7 +57,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers if (versionAttribute != null) { var version = new Version(versionAttribute); - if (!(version == new Version(2, 7))) + if (!(version == new Version(2, 7)) && !(version == new Version(2, 83))) { throw new FileFormatException($"Unsupported file version ({version})."); } @@ -183,8 +183,8 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers { if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole)) connectionInfo.UseConsoleSession = useConsole; - connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; - connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText; + connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText ?? string.Empty; + connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText ?? string.Empty; if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port)) connectionInfo.Port = port; } |