Merge branch 'master' into network-rewrite

1 files changed, 11 insertions, 3 deletions

diff --git a/Jellyfin.Networking/Manager/NetworkManager.cs b/Jellyfin.Networking/Manager/NetworkManager.cs
index f0f95f5fc..1b1e91e9f 100644
--- a/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -184,9 +184,16 @@ namespace Jellyfin.Networking.Manager
             {
                 Thread.Sleep(2000);
                 var networkConfig = _configurationManager.GetNetworkConfiguration();
-                InitialiseLan(networkConfig);
-                InitialiseInterfaces();
-                EnforceBindSettings(networkConfig);
+                if (IsIPv6Enabled && !Socket.OSSupportsIPv6)
+                {
+                    UpdateSettings(networkConfig);
+                }
+                else
+                {
+                    InitialiseInterfaces();
+                    InitialiseLan(networkConfig);
+                    EnforceBindSettings(networkConfig);
+                }
 
                 NetworkChanged?.Invoke(this, EventArgs.Empty);
             }
@@ -519,6 +526,7 @@ namespace Jellyfin.Networking.Manager
             ArgumentNullException.ThrowIfNull(configuration);
 
             var config = (NetworkConfiguration)configuration;
+            HappyEyeballs.HttpClientExtension.UseIPv6 = config.EnableIPv6;
 
             InitialiseLan(config);
             InitialiseRemote(config);