Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #720 from pedro2555/676

Browse Source 
First startup ignores cons param
This commit is contained in:
Sean Kaim
2017-09-15 17:33:22 -04:00
committed by GitHub
parent 9335c4706b e4e2f50015
commit b77c7e922f
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mRemoteV1/App/Startup.cs
View File

@@ -218,6 +218,33 @@ namespace mRemoteNG.App
}
}
/// <summary>
/// Returns a path to a file connections XML file for a given absolute or relative path
/// </summary>
/// <param name="ConsParam">The absolute or relative path to the connection XML file</param>
/// <returns>string or null</returns>
private static string GetCustomConsPath(string ConsParam)
{
// early exit condition
if (string.IsNullOrEmpty(ConsParam))
return null;
// trim invalid characters for the Combine method (see: https://msdn.microsoft.com/en-us/library/fyy7a5kt.aspx#Anchor_2)
ConsParam = ConsParam.Trim().TrimStart('\\').Trim();
// fallback paths
if (File.Exists(ConsParam))
return ConsParam;
if (File.Exists(Path.Combine(GeneralAppInfo.HomePath, ConsParam)))
return GeneralAppInfo.HomePath + Path.DirectorySeparatorChar + ConsParam;
if (File.Exists(Path.Combine(ConnectionsFileInfo.DefaultConnectionsPath, ConsParam)))
return ConnectionsFileInfo.DefaultConnectionsPath + Path.DirectorySeparatorChar + ConsParam;
// default case
return null;
}
private static void ParseCommandLineArgs()
{
@@ -282,30 +309,10 @@ namespace mRemoteNG.App
NoReconnectParam = "norc";
}
if (!string.IsNullOrEmpty(ConsParam))
{
if (File.Exists(cmd[ConsParam]) == false)
{
if (File.Exists(GeneralAppInfo.HomePath + "\\" + cmd[ConsParam]))
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = GeneralAppInfo.HomePath + "\\" + cmd[ConsParam];
return;
}
if (File.Exists(ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam]))
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam];
return;
}
}
else
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = cmd[ConsParam];
return;
}
}
// Handle custom connection file location
Settings.Default.CustomConsPath = GetCustomConsPath(ConsParam);
if (Settings.Default.CustomConsPath != null)
Settings.Default.LoadConsFromCustomLocation = true;
if (!string.IsNullOrEmpty(ResetPosParam))
{
@@ -329,6 +336,8 @@ namespace mRemoteNG.App
{
Settings.Default.ResetToolbars = true;
}
Settings.Default.Save();
}
catch (Exception ex)
{