diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index f494f622..8838cd94 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -716,13 +716,13 @@ namespace mRemoteNG.App public static string GetDefaultStartupConnectionFileName() { string newPath = App.Info.ConnectionsFileInfo.DefaultConnectionsPath + "\\" + Info.ConnectionsFileInfo.DefaultConnectionsFile; - #if !PORTABLE - string oldPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData) + "\\" + (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName + "\\" + Info.Connections.DefaultConnectionsFile; +#if !PORTABLE + string oldPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData) + "\\" + (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName + "\\" + App.Info.ConnectionsFileInfo.DefaultConnectionsFile; if (File.Exists(oldPath)) { return oldPath; } - #endif +#endif return newPath; } diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs index 18b7edc8..6a87b01f 100644 --- a/mRemoteV1/App/Startup.cs +++ b/mRemoteV1/App/Startup.cs @@ -220,11 +220,11 @@ namespace mRemoteNG.App } private static void LogApplicationData() { - #if !PORTABLE - Log.InfoFormat("{0} {1} starting.", System.Windows.Forms.Application.ProductName, System.Windows.Forms.Application.ProductVersion); - #else +#if !PORTABLE + Runtime.Log.InfoFormat("{0} {1} starting.", System.Windows.Forms.Application.ProductName, System.Windows.Forms.Application.ProductVersion); +#else Runtime.Log.InfoFormat("{0} {1} {2} starting.", System.Windows.Forms.Application.ProductName, System.Windows.Forms.Application.ProductVersion, My.Language.strLabelPortableEdition); - #endif +#endif } private static void LogCmdLineArgs() {