From 62fa3844f90d705c9f389e377e524e238d7df31d Mon Sep 17 00:00:00 2001
From: Gustave Monce <gustave.monce@outlook.com>
Date: Wed, 11 Aug 2021 11:11:46 +0200
Subject: [PATCH] DiscUtils: Fat: Merge more upstream changes related to
 encoding registration

---
 DiscUtils/DiscUtils.Fat/FatFileSystem.cs        |  6 ++++++
 DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs | 15 +++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/DiscUtils/DiscUtils.Fat/FatFileSystem.cs b/DiscUtils/DiscUtils.Fat/FatFileSystem.cs
index 31ec2db..f6df949 100644
--- a/DiscUtils/DiscUtils.Fat/FatFileSystem.cs
+++ b/DiscUtils/DiscUtils.Fat/FatFileSystem.cs
@@ -22,6 +22,7 @@
 
 namespace DiscUtils.Fat
 {
+    using DiscUtils.CoreCompat;
     using DiscUtils.Internal;
     using DiscUtils.Streams;
     using System;
@@ -78,6 +79,11 @@ namespace DiscUtils.Fat
         private ushort _bpbFSInfo;
         private ushort _bpbBkBootSec;
 
+        static FatFileSystem()
+        {
+            EncodingHelper.RegisterEncodings();
+        }
+
         /// <summary>
         /// Initializes a new instance of the FatFileSystem class.
         /// </summary>
diff --git a/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs b/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
index 10ec867..175f4f7 100644
--- a/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
+++ b/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
@@ -20,11 +20,11 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+using System;
+using System.Text;
+
 namespace DiscUtils.Fat
 {
-    using System;
-    using System.Text;
-
     /// <summary>
     /// FAT file system options.
     /// </summary>
@@ -34,7 +34,6 @@ namespace DiscUtils.Fat
 
         internal FatFileSystemOptions()
         {
-            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             FileNameEncoding = Encoding.GetEncoding(437);
         }
 
@@ -46,7 +45,6 @@ namespace DiscUtils.Fat
             }
             else
             {
-                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
                 FileNameEncoding = Encoding.GetEncoding(437);
             }
         }
@@ -56,10 +54,7 @@ namespace DiscUtils.Fat
         /// </summary>
         public Encoding FileNameEncoding
         {
-            get
-            {
-                return _encoding;
-            }
+            get { return _encoding; }
 
             set
             {
@@ -72,4 +67,4 @@ namespace DiscUtils.Fat
             }
         }
     }
-}
+}
\ No newline at end of file