diff --git a/MsgReader.sln b/MsgReader.sln index d26fa29f..48b46094 100644 --- a/MsgReader.sln +++ b/MsgReader.sln @@ -118,7 +118,6 @@ Global {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Any CPU.Build.0 = Release|Any CPU {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Win32.ActiveCfg = Release|Any CPU {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|Win32.Build.0 = Release|Any CPU {601408B8-D192-480F-9C8A-70F1BED7EFA9}.Release|x64.ActiveCfg = Release|Any CPU @@ -188,7 +187,6 @@ Global {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Any CPU.Build.0 = Release|Any CPU {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Win32.ActiveCfg = Release|Any CPU {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|Win32.Build.0 = Release|Any CPU {7627E4F4-44FE-465D-B89D-A4BB669B12D7}.Release|x64.ActiveCfg = Release|Any CPU @@ -258,7 +256,6 @@ Global {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Any CPU.Build.0 = Release|Any CPU {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Mixed Platforms.Build.0 = Release|x86 {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Win32.ActiveCfg = Release|x86 {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|Win32.Build.0 = Release|x86 {0EAB7816-7958-41D7-8713-E410C5403A6C}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/MsgReaderCore/MsgReader.xml b/MsgReaderCore/MsgReader.xml index 818d584d..545cf738 100644 --- a/MsgReaderCore/MsgReader.xml +++ b/MsgReaderCore/MsgReader.xml @@ -4135,9 +4135,10 @@ - Returns the for the Windows LCID of the end user who created this - It will return null when the Windows LCID could not be - read from the + Returns the for the Windows LCID of the end user who created this
+ It will return null when the Windows LCID could not be
+ read from the . null will be returned when the
+ local id is not present or invalid
diff --git a/MsgViewer/ViewerForm.cs b/MsgViewer/ViewerForm.cs index fb17ac97..a3a78887 100644 --- a/MsgViewer/ViewerForm.cs +++ b/MsgViewer/ViewerForm.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.Globalization; using System.IO; -using System.Reflection; using System.Threading; using System.Windows.Forms; @@ -56,10 +55,10 @@ private void ViewerForm_Load(object sender, EventArgs e) WindowPlacement.SetPlacement(Handle, Settings.Default.Placement); Closing += ViewerForm_Closing; generateHyperlinksToolStripMenuItem.Checked = Settings.Default.GenerateHyperLinks; - var version = Assembly.GetExecutingAssembly().GetName().Version; + //var version = Assembly.GetExecutingAssembly().GetName().Version; // ReSharper disable LocalizableElement - Text = "MSG Viewer v" + version.Major + "." + version.Minor + "." + version.Build; + Text = "MSG Viewer v5.6.1"; // ReSharper restore LocalizableElement SetCulture(Settings.Default.Language); @@ -113,7 +112,7 @@ private void PrintButton_Click(object sender, EventArgs e) private void webBrowser1_Navigated_1(object sender, WebBrowserNavigatedEventArgs e) { - StatusLabel.Text = e.Url.ToString(); + if (e.Url != null) StatusLabel.Text = e.Url.ToString(); BackButton.Enabled = webBrowser1.CanGoBack; ForwardButton.Enabled = webBrowser1.CanGoForward; }