From 8a3e37041a073427cb560325b0cb49f07d12c116 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Mon, 18 Sep 2017 17:37:04 -0400 Subject: [PATCH] remove unnecessary converts --- mRemoteV1/App/Runtime.cs | 12 ++++++------ mRemoteV1/App/Startup.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index f17259b38..9f567df41 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -283,7 +283,7 @@ namespace mRemoteNG.App connectionsLoader.ConnectionFileName = GetStartupConnectionFileName(); } - CreateBackupFile(Convert.ToString(connectionsLoader.ConnectionFileName)); + CreateBackupFile(connectionsLoader.ConnectionFileName); } connectionsLoader.UseDatabase = Settings.Default.UseSQLServer; @@ -334,7 +334,7 @@ namespace mRemoteNG.App if (ex is FileNotFoundException && !withDialog) { MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg); - NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName)); + NewConnections(connectionsLoader.ConnectionFileName); return; } @@ -465,11 +465,11 @@ namespace mRemoteNG.App if (Settings.Default.UseSQLServer) { connectionsSaver.SaveFormat = ConnectionsSaver.Format.SQL; - connectionsSaver.SQLHost = Convert.ToString(Settings.Default.SQLHost); - connectionsSaver.SQLDatabaseName = Convert.ToString(Settings.Default.SQLDatabaseName); - connectionsSaver.SQLUsername = Convert.ToString(Settings.Default.SQLUser); + connectionsSaver.SQLHost = Settings.Default.SQLHost; + connectionsSaver.SQLDatabaseName = Settings.Default.SQLDatabaseName; + connectionsSaver.SQLUsername = Settings.Default.SQLUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), EncryptionKey); + connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Settings.Default.SQLUser, EncryptionKey); } connectionsSaver.SaveConnections(); diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs index c8f95ccb7..f1ce0861e 100644 --- a/mRemoteV1/App/Startup.cs +++ b/mRemoteV1/App/Startup.cs @@ -74,7 +74,7 @@ namespace mRemoteNG.App { var osData = GetOperatingSystemData(); var architecture = GetArchitectureData(); - Logger.Instance.InfoFormat(string.Join(" ", Array.FindAll(new[] { osData, architecture }, s => !string.IsNullOrEmpty(Convert.ToString(s))))); + Logger.Instance.InfoFormat(string.Join(" ", Array.FindAll(new[] { osData, architecture }, s => !string.IsNullOrEmpty(s)))); } private static string GetOperatingSystemData()