Skip to content

Commit adaed83

Browse files
committed
* Minor fixes
1 parent 9040ea5 commit adaed83

File tree

4 files changed

+212
-204
lines changed

4 files changed

+212
-204
lines changed

Diff for: DeadLock/Classes/LanguageManager.cs

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
using System.IO;
1+
using System;
2+
using System.IO;
3+
using System.Windows.Forms;
24
using System.Xml.Serialization;
5+
using Syncfusion.Windows.Forms;
36

47
namespace DeadLock.Classes
58
{
@@ -9,7 +12,9 @@ namespace DeadLock.Classes
912
internal class LanguageManager
1013
{
1114
#region Variables
15+
1216
private Language _currentLanguage;
17+
1318
#endregion
1419

1520
/// <summary>
@@ -26,10 +31,18 @@ internal LanguageManager()
2631
/// <param name="path">Path to the XML language file.</param>
2732
internal void LoadLanguage(string path)
2833
{
29-
XmlSerializer serializer = new XmlSerializer(_currentLanguage.GetType());
30-
using (StreamReader reader = new StreamReader(path))
34+
try
35+
{
36+
XmlSerializer serializer = new XmlSerializer(_currentLanguage.GetType());
37+
using (StreamReader reader = new StreamReader(path))
38+
{
39+
_currentLanguage = (Language)serializer.Deserialize(reader);
40+
}
41+
}
42+
catch (Exception ex)
3143
{
32-
_currentLanguage = (Language)serializer.Deserialize(reader);
44+
MessageBoxAdv.Show(ex.Message, "DeadLock", MessageBoxButtons.OK, MessageBoxIcon.Error);
45+
LoadLanguage(1);
3346
}
3447
}
3548

Diff for: DeadLock/Forms/FrmMain.Designer.cs

+9-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: DeadLock/Forms/FrmMain.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ internal void LanguageSwitch()
135135
clhProcessID.Text = l.ClhProcessId;
136136

137137
//Main Form - Status bar:
138-
versionStaticBarItem.Text = l.LblVersion;
138+
versionStaticBarItem.Text = l.LblVersion + @" " + Application.ProductVersion;
139139

140140
//Main Form - ContextMenu Items:
141141
detailsToolStripMenuItem.Text = l.CmiDetails;
@@ -235,6 +235,7 @@ internal void LoadTheme()
235235
cmsDetails.MetroColor = Properties.Settings.Default.MetroColor;
236236
cmsTray.MetroColor = Properties.Settings.Default.MetroColor;
237237

238+
mfbmMain.BeginInit();
238239
mfbmMain.MetroColor = Properties.Settings.Default.MetroColor;
239240
mfbmMain.ResetCustomization = false;
240241
mfbmMain.Style = VisualStyle.Metro;
@@ -255,11 +256,6 @@ internal void LoadTheme()
255256
}
256257
}
257258

258-
private void FrmMain_Load(object sender, EventArgs e)
259-
{
260-
versionStaticBarItem.Text += @" " + Application.ProductVersion;
261-
}
262-
263259
private void aboutBarItem_Click(object sender, EventArgs e)
264260
{
265261
new FrmAbout(LanguageManager.GetLanguage()).ShowDialog();

0 commit comments

Comments
 (0)