Merge pull request #3 from akorb/master

Some more refactoring

Author: CodeDead

DeadLock/Forms/FrmMain.cs

@@ -60,6 +60,12 @@ public FrmMain(string[] args)
                     _languageManager.LoadLanguage(Properties.Settings.Default.Language);
                 }
                 LanguageSwitch();
+
+                nfiTray.Visible = Properties.Settings.Default.ShowNotifyIcon;
+                if (Properties.Settings.Default.RememberFormSize)
+                {
+                    Size = Properties.Settings.Default.FormSize;
+                }
             }
             catch (Exception ex)
             {
@@ -248,19 +254,6 @@ private void LoadTheme()
         private void FrmMain_Load(object sender, EventArgs e)
         {
             versionStaticBarItem.Text += " " + Application.ProductVersion;
-            try
-            {
-                nfiTray.Visible = Properties.Settings.Default.ShowNotifyIcon;
-                if (Properties.Settings.Default.RememberFormSize)
-                {
-                    Size = Properties.Settings.Default.FormSize;
-                    CenterToScreen();
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBoxAdv.Show(ex.Message, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
         }
 
         private void aboutBarItem_Click(object sender, EventArgs e)

DeadLock/Forms/FrmSettings.cs

@@ -219,7 +219,7 @@ private void SaveSettings()
 
                 List<string> args = new List<string>();
 
-                if(_originalStartup != (tbtnAutoRun.ToggleState == ToggleButtonState.Active))
+                if (_originalStartup != (tbtnAutoRun.ToggleState == ToggleButtonState.Active))
                 {
                     _originalStartup = tbtnAutoRun.ToggleState == ToggleButtonState.Active;
                     args.Add(_originalStartup ? "0" : "1");
@@ -251,15 +251,7 @@ private void SaveSettings()
         /// <param name="args">A list of arguments.</param>
         private static void StartRegManager(IReadOnlyList<string> args)
         {
-            string a = "";
-            for (int i = 0; i < args.Count; i++)
-            {
-                a += args[i];
-                if (i != args.Count -1)
-                {
-                    a += " ";
-                }
-            }
+            string a = string.Join(" ", args);
             Process process = new Process
             {
                 StartInfo =
@@ -376,7 +368,7 @@ private void btnSave_Click(object sender, EventArgs e)
         private void btnSelectPath_Click(object sender, EventArgs e)
         {
             cboLanguage.SelectedIndex = 2;
-            OpenFileDialog ofd = new OpenFileDialog {Filter = "XML (*.xml)|*.xml"};
+            OpenFileDialog ofd = new OpenFileDialog { Filter = "XML (*.xml)|*.xml" };
             if (ofd.ShowDialog() == DialogResult.OK)
             {
                 txtLanguagePath.Text = ofd.FileName;