From 00bc45fba12d1e794358cd482c93ffccd7279dc9 Mon Sep 17 00:00:00 2001 From: tecxx Date: Tue, 14 Dec 2021 21:45:39 +0100 Subject: [PATCH] fix some more inconsistencies with "StartProgramWorkDir" --- .../RemoteDesktopConnectionManagerDeserializer.cs | 2 +- mRemoteNG/Connection/AbstractConnectionRecord.cs | 2 +- mRemoteNG/Connection/ConnectionInfo.cs | 1 + mRemoteNG/Properties/Settings.Designer.cs | 12 ++++++++++++ mRemoteNG/Properties/Settings.settings | 3 +++ mRemoteNG/app.config | 3 +++ .../SerializableConnectionInfoAllPropertiesOfType.cs | 1 + .../ConfigWindowTests/ConfigWindowGeneralTests.cs | 3 ++- 8 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index dee482d02..8f0af1763 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -184,7 +184,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole)) connectionInfo.UseConsoleSession = useConsole; connectionInfo.StartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; - // ./workingDir + connectionInfo.StartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText; if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port)) connectionInfo.Port = port; } diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index de680bc37..65b9d2bf6 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -27,7 +27,6 @@ namespace mRemoteNG.Connection private string _domain = ""; private string _vmId = ""; private bool _useEnhancedMode; - private string _startProgramWorkDir = ""; private string _sshTunnelConnectionName = ""; private ProtocolType _protocol; @@ -81,6 +80,7 @@ namespace mRemoteNG.Connection private string _openingCommand; private string _userField; private string _startProgram; + private string _startProgramWorkDir; private bool _favorite; private ProtocolVNC.Compression _vncCompression; diff --git a/mRemoteNG/Connection/ConnectionInfo.cs b/mRemoteNG/Connection/ConnectionInfo.cs index 6afd1a7a9..dda409f3e 100644 --- a/mRemoteNG/Connection/ConnectionInfo.cs +++ b/mRemoteNG/Connection/ConnectionInfo.cs @@ -368,6 +368,7 @@ namespace mRemoteNG.Connection UserField = Settings.Default.ConDefaultUserField; Favorite = Settings.Default.ConDefaultFavorite; StartProgram = Settings.Default.ConDefaultStartProgram; + StartProgramWorkDir = Settings.Default.ConDefaultStartProgram; OpeningCommand = Settings.Default.OpeningCommand; } diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index afeaaf09e..e2901e2ba 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -3107,6 +3107,18 @@ namespace mRemoteNG.Properties { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string ConDefaultStartProgramWorkDir { + get { + return ((string)(this["ConDefaultStartProgramWorkDir"])); + } + set { + this["ConDefaultStartProgramWorkDir"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("EncrBasic")] diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings index cb74c10ef..538ee7756 100644 --- a/mRemoteNG/Properties/Settings.settings +++ b/mRemoteNG/Properties/Settings.settings @@ -773,6 +773,9 @@ + + + EncrBasic diff --git a/mRemoteNG/app.config b/mRemoteNG/app.config index d9d62c1d9..be7a5f059 100644 --- a/mRemoteNG/app.config +++ b/mRemoteNG/app.config @@ -789,6 +789,9 @@ + + + EncrBasic diff --git a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs index 9d8b94788..984b3cdde 100644 --- a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs +++ b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs @@ -73,6 +73,7 @@ public TType SSHOptions { get; set; } public TType SSHTunnelConnectionName { get; set; } public TType StartProgram { get; set; } + public TType StartProgramWorkDir { get; set; } public TType OpeningCommand { get; set; } } } diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs index 761ae733a..352867136 100644 --- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs +++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs @@ -261,7 +261,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.RedirectAudioCapture), nameof(ConnectionInfo.RdpVersion), nameof(ConnectionInfo.OpeningCommand), - nameof(ConnectionInfo.StartProgram) + nameof(ConnectionInfo.StartProgram), + nameof(ConnectionInfo.StartProgramWorkDir) }); break; case ProtocolType.VNC: