* Minor fixes

CodeDead · Sep 7, 2016 · adaed83 · adaed83
1 parent 9040ea5
commit adaed83
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 204 deletions.
diff --git a/DeadLock/Classes/LanguageManager.cs b/DeadLock/Classes/LanguageManager.cs
@@ -1,5 +1,8 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Windows.Forms;
 using System.Xml.Serialization;
+using Syncfusion.Windows.Forms;
 
 namespace DeadLock.Classes
 {
@@ -9,7 +12,9 @@ namespace DeadLock.Classes
     internal class LanguageManager
     {
         #region Variables
+
         private Language _currentLanguage;
+
         #endregion
 
         /// <summary>
@@ -26,10 +31,18 @@ internal LanguageManager()
         /// <param name="path">Path to the XML language file.</param>
         internal void LoadLanguage(string path)
         {
-            XmlSerializer serializer = new XmlSerializer(_currentLanguage.GetType());
-            using (StreamReader reader = new StreamReader(path))
+            try
+            {
+                XmlSerializer serializer = new XmlSerializer(_currentLanguage.GetType());
+                using (StreamReader reader = new StreamReader(path))
+                {
+                    _currentLanguage = (Language)serializer.Deserialize(reader);
+                }
+            }
+            catch (Exception ex)
             {
-                _currentLanguage = (Language)serializer.Deserialize(reader);
+                MessageBoxAdv.Show(ex.Message, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                LoadLanguage(1);
             }
         }
 

diff --git a/DeadLock/Forms/FrmMain.Designer.cs b/DeadLock/Forms/FrmMain.Designer.cs
diff --git a/DeadLock/Forms/FrmMain.cs b/DeadLock/Forms/FrmMain.cs
@@ -135,7 +135,7 @@ internal void LanguageSwitch()
             clhProcessID.Text = l.ClhProcessId;
 
             //Main Form - Status bar:
-            versionStaticBarItem.Text = l.LblVersion;
+            versionStaticBarItem.Text = l.LblVersion + @" " + Application.ProductVersion;
 
             //Main Form - ContextMenu Items:
             detailsToolStripMenuItem.Text = l.CmiDetails;
@@ -235,6 +235,7 @@ internal void LoadTheme()
                 cmsDetails.MetroColor = Properties.Settings.Default.MetroColor;
                 cmsTray.MetroColor = Properties.Settings.Default.MetroColor;
 
+                mfbmMain.BeginInit();
                 mfbmMain.MetroColor = Properties.Settings.Default.MetroColor;
                 mfbmMain.ResetCustomization = false;
                 mfbmMain.Style = VisualStyle.Metro;
@@ -255,11 +256,6 @@ internal void LoadTheme()
             }
         }
 
-        private void FrmMain_Load(object sender, EventArgs e)
-        {
-            versionStaticBarItem.Text += @" " + Application.ProductVersion;
-        }
-
         private void aboutBarItem_Click(object sender, EventArgs e)
         {
             new FrmAbout(LanguageManager.GetLanguage()).ShowDialog();