feat: Normalise process file/directory/info to avoid Windows.Forms

twpol · twpol · commit f4ac1a5e9d75 · 2024-07-21T17:39:59.000+01:00
diff --git a/Source/ContentChecker/Program.cs b/Source/ContentChecker/Program.cs
@@ -77,11 +77,10 @@ static bool OptionsContain(string[] args, IEnumerable<string> optionNames) {
         /// </summary>
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <FILE>           Data files to check; may contain wildcards");
diff --git a/Source/Contrib/DataCollector/Program.cs b/Source/Contrib/DataCollector/Program.cs
@@ -19,7 +19,6 @@
 using ORTS.Common;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
@@ -39,11 +38,10 @@ static void Main(string[] args)
 
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] [<PATH> [...]]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <PATH>         Directories to scan for specific options");
diff --git a/Source/Contrib/DataConverter/Program.cs b/Source/Contrib/DataConverter/Program.cs
@@ -17,7 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
@@ -87,11 +86,10 @@ static void Main(string[] args)
 
         static void ShowHelp(List<IDataConverter> converters)
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} /input <INPUT> [/output] [<OUTPUT> [...]]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} /input <INPUT> [/output] [<OUTPUT> [...]]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <INPUT>   Specifies the file to read");
diff --git a/Source/Contrib/DataValidator/Program.cs b/Source/Contrib/DataValidator/Program.cs
@@ -39,11 +39,10 @@ static void Main(string[] args)
 
         static void ShowHelp()
         {
-            var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location);
-            Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+            Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
             Console.WriteLine();
             Console.WriteLine("Usage:");
-            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(version.FileName));
+            Console.WriteLine("  {0} [options] <FILE> [...]", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
             Console.WriteLine();
             Console.WriteLine("Arguments:");
             Console.WriteLine("  <FILE>    Data files to validate; may contain wildcards");
diff --git a/Source/Contrib/SimulatorTester/Program.cs b/Source/Contrib/SimulatorTester/Program.cs
@@ -21,9 +21,7 @@
 using Orts.Simulation;
 using ORTS.Common;
 using System.IO;
-using System.Windows.Forms;
 using Orts.Common;
-using System.Diagnostics;
 
 namespace SimulatorTester
 {
@@ -37,23 +35,22 @@ static void Main(string[] args)
 
             if (files.Count != 1 || options.Contains("help", StringComparer.InvariantCultureIgnoreCase))
             {
-                var version = FileVersionInfo.GetVersionInfo(Application.ExecutablePath);
-                Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild);
+                Console.WriteLine("{0} {1}", ApplicationInfo.ApplicationName, VersionInfo.VersionOrBuild);
                 Console.WriteLine();
                 Console.WriteLine("Usage:");
-                Console.WriteLine("  {0} [options] <SAVE_FILE>", Path.GetFileNameWithoutExtension(Application.ExecutablePath));
+                Console.WriteLine("  {0} [options] <SAVE_FILE>", Path.GetFileNameWithoutExtension(ApplicationInfo.ProcessFile));
                 Console.WriteLine();
                 Console.WriteLine("Arguments:");
-                Console.WriteLine("  <SAVE_FILE>  {0} save file to use", Application.ProductName);
+                Console.WriteLine("  <SAVE_FILE>  {0} save file to use", ApplicationInfo.ProductName);
                 Console.WriteLine();
                 Console.WriteLine("Options:");
                 Console.WriteLine("  /quiet       Do not show summary of simulation (only exit code is set)");
-                Console.WriteLine("  /verbose     Show version and settings (similar to a {0} log)", Application.ProductName);
+                Console.WriteLine("  /verbose     Show version and settings (similar to a {0} log)", ApplicationInfo.ProductName);
                 Console.WriteLine("  /fps <FPS>   Set the simulation frame-rate [default: 10]");
                 Console.WriteLine("  /help        Show help and usage information");
-                Console.WriteLine("  ...and any standard {0} option", Application.ProductName);
+                Console.WriteLine("  ...and any standard {0} option", ApplicationInfo.ProductName);
                 Console.WriteLine();
-                Console.WriteLine("The {0} takes a save file and:", version.FileDescription);
+                Console.WriteLine("The {0} takes a save file and:", ApplicationInfo.ApplicationName);
                 Console.WriteLine("  - Loads the same activity as contained in the save file");
                 Console.WriteLine("  - Runs the simulation at the specified FPS for the same duration as the save file");
                 Console.WriteLine("  - Compares the final position with that contained in the save file");
@@ -65,15 +62,15 @@ static void Main(string[] args)
 
             if (settings.Verbose)
             {
-                Console.WriteLine("This is a log file for {0}. Please include this file in bug reports.", Application.ProductName);
+                Console.WriteLine("This is a log file for {0}. Please include this file in bug reports.", ApplicationInfo.ProductName);
                 LogSeparator();
 
                 SystemInfo.WriteSystemDetails(Console.Out);
                 LogSeparator();
 
                 Console.WriteLine("Version      = {0}", VersionInfo.Version.Length > 0 ? VersionInfo.Version : "<none>");
                 Console.WriteLine("Build        = {0}", VersionInfo.Build);
-                Console.WriteLine("Executable   = {0}", Path.GetFileName(Application.ExecutablePath));
+                Console.WriteLine("Executable   = {0}", Path.GetFileName(ApplicationInfo.ProcessFile));
                 foreach (var arg in args)
                     Console.WriteLine("Argument     = {0}", arg);
                 LogSeparator();
diff --git a/Source/Menu/MainForm.cs b/Source/Menu/MainForm.cs
@@ -77,7 +77,7 @@ internal string RunActivityProgram
         {
             get
             {
-                return System.IO.Path.Combine(Application.StartupPath, "RunActivity.exe");
+                return System.IO.Path.Combine(ApplicationInfo.ProcessDirectory, "RunActivity.exe");
             }
         }
 
@@ -127,7 +127,7 @@ public MainForm()
             panelModeTimetable.Location = panelModeActivity.Location;
             ShowDetails();
             UpdateEnabled();
-            UpdateManager = new UpdateManager(System.IO.Path.GetDirectoryName(Application.ExecutablePath), Application.ProductName, VersionInfo.VersionOrBuild);
+            UpdateManager = new UpdateManager(ApplicationInfo.ProcessDirectory, Application.ProductName, VersionInfo.VersionOrBuild);
             ElevationIcon = new Icon(SystemIcons.Shield, SystemInformation.SmallIconSize).ToBitmap();
         }
 
@@ -183,7 +183,7 @@ void MainForm_Shown(object sender, EventArgs e)
                     "Updater.exe",
                 };
                 var tools = new List<ToolStripItem>();
-                foreach (var executable in Directory.GetFiles(System.IO.Path.GetDirectoryName(Application.ExecutablePath), "*.exe"))
+                foreach (var executable in Directory.GetFiles(ApplicationInfo.ProcessDirectory, "*.exe"))
                 {
                     // Don't show any of the core parts of the application.
                     if (coreExecutables.Contains(System.IO.Path.GetFileName(executable)))
@@ -353,7 +353,7 @@ void LoadLanguage()
 
         void RestartMenu()
         {
-            Process.Start(Application.ExecutablePath);
+            Process.Start(ApplicationInfo.ProcessFile);
             Close();
         }
         #endregion
diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs
@@ -27,6 +27,7 @@
 using GNU.Gettext;
 using GNU.Gettext.WinForms;
 using MSTS;
+using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Settings;
 using ORTS.Updater;
@@ -72,7 +73,7 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             // Collect all the available language codes by searching for
             // localisation files, but always include English (base language).
             var languageCodes = new List<string> { "en" };
-            foreach (var path in Directory.GetDirectories(Path.GetDirectoryName(Application.ExecutablePath)))
+            foreach (var path in Directory.GetDirectories(ApplicationInfo.ProcessDirectory))
                 if (Directory.GetFiles(path, "*.Messages.resources.dll").Length > 0)
                     languageCodes.Add(Path.GetFileName(path));
 
@@ -728,11 +729,11 @@ private void textBoxContentName_TextChanged(object sender, EventArgs e)
             var current = bindingSourceContent.Current as ContentFolder;
             if (current != null && current.Name != textBoxContentName.Text)
             {
-                if (current.Path.ToLower().Contains(Application.StartupPath.ToLower()))
+                if (current.Path.ToLower().Contains(ApplicationInfo.ProcessDirectory.ToLower()))
                 {
                     // Block added because a succesful Update operation will empty the Open Rails folder and lose any content stored within it.
                     MessageBox.Show(catalog.GetString
-                        ($"Cannot use content from any folder which lies inside the Open Rails folder {Application.StartupPath}\n\n")
+                        ($"Cannot use content from any folder which lies inside the Open Rails folder {ApplicationInfo.ProcessDirectory}\n\n")
                         , "Invalid content location"
                         , MessageBoxButtons.OK
                         , MessageBoxIcon.Error);
diff --git a/Source/Menu/Program.cs b/Source/Menu/Program.cs
@@ -168,7 +168,7 @@ static void MainForm()
                         FileName = MainForm.RunActivityProgram,
                         Arguments = joinedParameters,
                         WindowStyle = ProcessWindowStyle.Normal,
-                        WorkingDirectory = Application.StartupPath,
+                        WorkingDirectory = ApplicationInfo.ProcessDirectory,
                     };
                     var process = Process.Start(processStartInfo);
                     process.WaitForExit();
diff --git a/Source/Menu/TestingForm.cs b/Source/Menu/TestingForm.cs
@@ -25,6 +25,7 @@
 using System.Windows.Forms;
 using GNU.Gettext;
 using GNU.Gettext.WinForms;
+using ORTS.Common;
 using ORTS.Menu;
 using ORTS.Settings;
 using Activity = ORTS.Menu.Activity;
@@ -186,7 +187,7 @@ void TestMarkedActivities(IEnumerable<DataGridViewRow> rows)
                 var processStartInfo = new ProcessStartInfo();
                 processStartInfo.FileName = MainForm.RunActivityProgram;
                 processStartInfo.WindowStyle = ProcessWindowStyle.Normal;
-                processStartInfo.WorkingDirectory = Application.StartupPath;
+                processStartInfo.WorkingDirectory = ApplicationInfo.ProcessDirectory;
 
                 if (!ClearedLogs)
                 {
diff --git a/Source/ORTS.Common/ApplicationInfo.cs b/Source/ORTS.Common/ApplicationInfo.cs
@@ -0,0 +1,31 @@
+// COPYRIGHT 2009 - 2024 by the Open Rails project.
+//
+// This file is part of Open Rails.
+//
+// Open Rails is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Open Rails is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
+
+using System.Diagnostics;
+using System.IO;
+
+namespace ORTS.Common
+{
+    public static class ApplicationInfo
+    {
+        public static string ProcessFile => Process.GetCurrentProcess().MainModule.FileName;
+        public static string ProcessDirectory => Path.GetDirectoryName(ProcessFile);
+        static FileVersionInfo VersionInfo => FileVersionInfo.GetVersionInfo(ProcessFile);
+        public static string ProductName => VersionInfo.ProductName;
+        public static string ApplicationName => VersionInfo.FileDescription;
+    }
+}
diff --git a/Source/ORTS.Common/VersionInfo.cs b/Source/ORTS.Common/VersionInfo.cs
@@ -19,7 +19,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 
 namespace ORTS.Common
 {
@@ -28,8 +27,6 @@ namespace ORTS.Common
     /// </summary>
     public static class VersionInfo
     {
-        static readonly string ApplicationPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
-
         /// <summary>Full version, e.g. stable: "1.4", testing: "T1.4-1-g1234567", unstable: "U2021.01.01-0000", local: ""</summary>
         public static readonly string Version = GetVersion("OpenRails.exe");
 
@@ -43,7 +40,7 @@ static string GetVersion(string fileName)
         {
             try
             {
-                var version = FileVersionInfo.GetVersionInfo(Path.Combine(ApplicationPath, fileName));
+                var version = FileVersionInfo.GetVersionInfo(Path.Combine(ApplicationInfo.ProcessDirectory, fileName));
                 if (version.ProductVersion != version.FileVersion)
                     return version.ProductVersion;
             }
@@ -58,7 +55,7 @@ static string GetBuild(string fileName)
             var builds = new Dictionary<TimeSpan, string>();
             try
             {
-                var version = FileVersionInfo.GetVersionInfo(Path.Combine(ApplicationPath, fileName));
+                var version = FileVersionInfo.GetVersionInfo(Path.Combine(ApplicationInfo.ProcessDirectory, fileName));
                 var datetime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
                 var timespan = new TimeSpan(version.FileBuildPart, 0, 0, version.FilePrivatePart * 2);
                 return String.Format("{0} ({1:u})", version.FileVersion, datetime + timespan);
diff --git a/Source/ORTS.Settings/UpdateSettings.cs b/Source/ORTS.Settings/UpdateSettings.cs
@@ -20,14 +20,13 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Windows.Forms;
 using ORTS.Common;
 
 namespace ORTS.Settings
 {
     public class UpdateSettings : SettingsBase
     {
-        public static readonly string SettingsFilePath = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Updater.ini");
+        public static readonly string SettingsFilePath = Path.Combine(ApplicationInfo.ProcessDirectory, "Updater.ini");
 
         #region User Settings
 
diff --git a/Source/ORTS.Settings/UserSettings.cs b/Source/ORTS.Settings/UserSettings.cs
@@ -54,7 +54,7 @@ static UserSettings()
         {
             // Only one of these is allowed; if the INI file exists, we use that, otherwise we use the registry.
             RegistryKey = "SOFTWARE\\OpenRails\\ORTS";
-            SettingsFilePath = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "OpenRails.ini");
+            SettingsFilePath = Path.Combine(ApplicationInfo.ProcessDirectory, "OpenRails.ini");
             if (File.Exists(SettingsFilePath))
                 RegistryKey = null;
             else
diff --git a/Source/RunActivity/Program.cs b/Source/RunActivity/Program.cs
@@ -18,7 +18,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Orts.Common;
@@ -57,7 +56,7 @@ static void Main(string[] args)
             var settings = new UserSettings(options);
 
             //enables loading of dll for specific architecture(32 or 64bit) from distinct folders, useful when both versions require same name (as for OpenAL32.dll)
-            string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Native");
+            string path = Path.Combine(ApplicationInfo.ProcessDirectory, "Native");
             path = Path.Combine(path, (Environment.Is64BitProcess) ? "X64" : "X86");
             NativeMethods.SetDllDirectory(path);
 
diff --git a/Source/RunActivity/Viewer3D/Popups/HelpWindow.cs b/Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
@@ -30,7 +30,6 @@
 using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Settings;
-using Orts.Viewer3D.Processes;
 
 namespace Orts.Viewer3D.Popups
 {
@@ -612,7 +611,7 @@ private void ReportEvaluation(WindowManager owner, ControlLayout cl, TrainCar lo
             if (Program.EvaluationFilename.Length > 0)
                 consolewltext("Debrief file = " + Program.EvaluationFilename);
 
-            consolewltext("Executable   = " + Path.GetFileName(Application.ExecutablePath));
+            consolewltext("Executable   = " + Path.GetFileName(ApplicationInfo.ProcessFile));
             LogSeparator(80);
             line.AddHorizontalSeparator();
 
diff --git a/Source/RunActivity/Viewer3D/Processes/Game.cs b/Source/RunActivity/Viewer3D/Processes/Game.cs
@@ -95,7 +95,7 @@ public class Game : Microsoft.Xna.Framework.Game
         public Game(UserSettings settings)
         {
             Settings = settings;
-            ContentPath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Content");
+            ContentPath = System.IO.Path.Combine(ApplicationInfo.ProcessDirectory, "Content");
             Exiting += new System.EventHandler<System.EventArgs>(Game_Exiting);
             WatchdogProcess = new WatchdogProcess(this);
             RenderProcess = new RenderProcess(this);
diff --git a/Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs b/Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
@@ -816,7 +816,7 @@ void InitLogging(UserSettings settings, string[] args, bool appendLog)
                 Console.WriteLine("Build      = {0}", VersionInfo.Build);
                 if (logFileName.Length > 0)
                     Console.WriteLine("Logfile    = {0}", logFileName);
-                Console.WriteLine("Executable = {0}", Path.GetFileName(Application.ExecutablePath));
+                Console.WriteLine("Executable = {0}", Path.GetFileName(ApplicationInfo.ProcessFile));
                 foreach (var arg in args)
                     Console.WriteLine("Argument   = {0}", arg);
 
diff --git a/Source/RunActivity/Viewer3D/Processes/WebServerProcess.cs b/Source/RunActivity/Viewer3D/Processes/WebServerProcess.cs
@@ -24,7 +24,6 @@
 using ORTS.Common;
 using Orts.Processes;
 using System.IO;
-using System.Windows.Forms;
 using CancellationTokenSource = System.Threading.CancellationTokenSource;
 using System.Net.Sockets;
 using System.Diagnostics;
@@ -85,7 +84,7 @@ void WebServerThread()
 
         private string myWebContentPath()
         {
-            string exePath = Path.GetDirectoryName(Application.ExecutablePath);
+            string exePath = ApplicationInfo.ProcessDirectory;
             if (!System.Diagnostics.Debugger.IsAttached)
             {
                 // no debugger attached, not developing
diff --git a/Source/RunActivity/Viewer3D/Shaders.cs b/Source/RunActivity/Viewer3D/Shaders.cs
@@ -36,7 +36,7 @@ protected Shader(GraphicsDevice graphicsDevice, string filename)
 
         static byte[] GetEffectCode(string filename)
         {
-            string filePath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath), "Content", filename + ".mgfx");
+            string filePath = Path.Combine(ApplicationInfo.ProcessDirectory, "Content", filename + ".mgfx");
             return File.ReadAllBytes(filePath);
         }
     }
diff --git a/Source/Updater/UpdaterProgress.cs b/Source/Updater/UpdaterProgress.cs

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ internal string RunActivityProgram`
`77`	`77`	`{`
`78`	`78`	`get`
`79`	`79`	`{`
`80`		`- return System.IO.Path.Combine(Application.StartupPath, "RunActivity.exe");`
	`80`	`+ return System.IO.Path.Combine(ApplicationInfo.ProcessDirectory, "RunActivity.exe");`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -127,7 +127,7 @@ public MainForm()`
`127`	`127`	`panelModeTimetable.Location = panelModeActivity.Location;`
`128`	`128`	`ShowDetails();`
`129`	`129`	`UpdateEnabled();`
`130`		`- UpdateManager = new UpdateManager(System.IO.Path.GetDirectoryName(Application.ExecutablePath), Application.ProductName, VersionInfo.VersionOrBuild);`
	`130`	`+ UpdateManager = new UpdateManager(ApplicationInfo.ProcessDirectory, Application.ProductName, VersionInfo.VersionOrBuild);`
`131`	`131`	`ElevationIcon = new Icon(SystemIcons.Shield, SystemInformation.SmallIconSize).ToBitmap();`
`132`	`132`	`}`
`133`	`133`
`@@ -183,7 +183,7 @@ void MainForm_Shown(object sender, EventArgs e)`
`183`	`183`	`"Updater.exe",`
`184`	`184`	`};`
`185`	`185`	`var tools = new List<ToolStripItem>();`
`186`		`- foreach (var executable in Directory.GetFiles(System.IO.Path.GetDirectoryName(Application.ExecutablePath), "*.exe"))`
	`186`	`+ foreach (var executable in Directory.GetFiles(ApplicationInfo.ProcessDirectory, "*.exe"))`
`187`	`187`	`{`
`188`	`188`	`// Don't show any of the core parts of the application.`
`189`	`189`	`if (coreExecutables.Contains(System.IO.Path.GetFileName(executable)))`
`@@ -353,7 +353,7 @@ void LoadLanguage()`
`353`	`353`
`354`	`354`	`void RestartMenu()`
`355`	`355`	`{`
`356`		`- Process.Start(Application.ExecutablePath);`
	`356`	`+ Process.Start(ApplicationInfo.ProcessFile);`
`357`	`357`	`Close();`
`358`	`358`	`}`
`359`	`359`	`#endregion`