Merge branch 'master' into patch-1

Author: megalon

ModAssistant/App.config

@@ -50,6 +50,12 @@
             <setting name="ReinstallInstalled" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="CloseWindowOnFinish" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="LanguageCode" serializeAs="String">
+                <value />
+            </setting>
         </ModAssistant.Properties.Settings>
         <ModAssistant.Settings1>
             <setting name="InstallFolder" serializeAs="String">

ModAssistant/App.xaml.cs

@@ -21,8 +21,11 @@ public partial class App : Application
         public static bool CheckInstalledMods;
         public static bool SelectInstalledMods;
         public static bool ReinstallInstalledMods;
+        public static bool CloseWindowOnFinish;
         public static string Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
         public static List<string> SavedMods = ModAssistant.Properties.Settings.Default.SavedMods.Split(',').ToList();
+        public static MainWindow window;
+        public static string Arguments;
         public static bool Update = true;
         public static bool GUI = true;
 
@@ -31,12 +34,7 @@ private async void Application_Startup(object sender, StartupEventArgs e)
         {
             // Set SecurityProtocol to prevent crash with TLS
             System.Net.ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
-
-            // Load localisation languages
-            LoadLanguage(CultureInfo.CurrentCulture.Name);
-
-            // Uncomment the next line to debug localisation
-            // LoadLanguage("en-DEBUG");
+            Languages.LoadLanguages();
 
             if (ModAssistant.Properties.Settings.Default.UpgradeRequired)
             {
@@ -68,27 +66,40 @@ private async void Application_Startup(object sender, StartupEventArgs e)
             CheckInstalledMods = ModAssistant.Properties.Settings.Default.CheckInstalled;
             SelectInstalledMods = ModAssistant.Properties.Settings.Default.SelectInstalled;
             ReinstallInstalledMods = ModAssistant.Properties.Settings.Default.ReinstallInstalled;
+            CloseWindowOnFinish = ModAssistant.Properties.Settings.Default.CloseWindowOnFinish;
 
             await ArgumentHandler(e.Args);
-            await Init(Update, GUI);
+            await Init();
         }
 
-        private async Task Init(bool Update, bool GUI)
+        private async Task Init()
         {
             if (Update)
             {
-                await Task.Run(async () => await Updater.Run());
+                try
+                {
+                    await Task.Run(async () => await Updater.Run());
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    Utils.StartAsAdmin(Arguments, true);
+                }
             }
 
             if (GUI)
             {
-                MainWindow window = new MainWindow();
+                window = new MainWindow();
                 window.Show();
             }
+            else
+            {
+                //Application.Current.Shutdown();
+            }
         }
 
         private async Task ArgumentHandler(string[] args)
         {
+            Arguments = string.Join(" ", args);
             while (args.Length > 0)
             {
                 switch (args[0])
@@ -103,6 +114,12 @@ private async Task ArgumentHandler(string[] args)
                             await OneClickInstaller.InstallAsset(args[1]);
                         }
 
+                        if (CloseWindowOnFinish)
+                        {
+                            await Task.Delay(5 * 1000);
+                            Current.Shutdown();
+                        }
+
                         Update = false;
                         GUI = false;
                         args = Shift(args, 2);
@@ -120,7 +137,12 @@ private async Task ArgumentHandler(string[] args)
                         }
                         else
                         {
-                            LoadLanguage(args[1]);
+                            if (Languages.LoadLanguage(args[1]))
+                            {
+                                ModAssistant.Properties.Settings.Default.LanguageCode = args[1];
+                                ModAssistant.Properties.Settings.Default.Save();
+                                Languages.UpdateUI(args[1]);
+                            }
                         }
 
                         args = Shift(args, 2);
@@ -156,6 +178,12 @@ private async Task ArgumentHandler(string[] args)
                         args = Shift(args, 2);
                         break;
 
+                    case "--runforever":
+                        while (true)
+                        {
+
+                        }
+
                     default:
                         Utils.SendNotify((string)Current.FindResource("App:UnrecognizedArgument"));
                         args = Shift(args);
@@ -185,29 +213,5 @@ private void Application_DispatcherUnhandledException(object sender, System.Wind
             e.Handled = true;
             Application.Current.Shutdown();
         }
-
-        private ResourceDictionary LanguagesDict
-        {
-            get
-            {
-                return Resources.MergedDictionaries[1];
-            }
-        }
-
-        private void LoadLanguage(string culture)
-        {
-            try
-            {
-                LanguagesDict.Source = new Uri($"Localisation/{culture}.xaml", UriKind.Relative);
-            }
-            catch (IOException)
-            {
-                if (culture.Contains("-"))
-                {
-                    LoadLanguage(culture.Split('-').First());
-                }
-                // Can't load language file
-            }
-        }
     }
 }