fix encoding initialization (#1)

specshell · Nov 12, 2020 · a216985 · a216985
1 parent 795b0e7
commit a216985
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Source/NDde/Advanced/DdeContext.cs b/Source/NDde/Advanced/DdeContext.cs
@@ -120,8 +120,6 @@ public sealed class DdeContext : IDisposable, ISynchronizeInvoke
  /// </remarks>
  public DdeContext()
  {
- Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
- _Encoding = Encoding.GetEncoding(1252);
  }
 
  /// <summary>
@@ -234,6 +232,11 @@ public Encoding Encoding
  {
  lock (_LockObject)
  {
+ if (_Encoding == null)
+ {
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+ _Encoding = Encoding.GetEncoding(1252);
+ }
  return _Encoding;
  }
  }
@@ -769,7 +772,7 @@ protected override CreateParams CreateParams
  {
  get
  {
- const int WS_POPUP = unchecked((int) 0x80000000);
+ const int WS_POPUP = unchecked((int)0x80000000);
  const int WS_EX_TOOLWINDOW = 0x80;
 
  var cp = base.CreateParams;