From 9af28607c990f5ddcd738c72d7183b9a57ba47c2 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 6 Feb 2019 14:04:32 +0100
Subject: Simplify plugin loading

---
 Jellyfin.Server/CoreAppHost.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Jellyfin.Server/CoreAppHost.cs')

diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index 315e34a04..a486c2a47 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -21,7 +21,9 @@ namespace Jellyfin.Server
         protected override void RestartInternal() => Program.Restart();
 
         protected override IEnumerable<Assembly> GetAssembliesWithPartsInternal()
-            => new[] { typeof(CoreAppHost).Assembly };
+        {
+            yield return typeof(CoreAppHost).Assembly;
+        }
 
         protected override void ShutdownInternal() => Program.Shutdown();
 
-- 
cgit v1.2.3


From 34af7501fa33f807aa7e721a95294b623f2d4d6c Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Wed, 13 Feb 2019 17:06:32 +0100
Subject: Fix up CoreAppHost.cs

---
 Jellyfin.Server/CoreAppHost.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Jellyfin.Server/CoreAppHost.cs')

diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index a486c2a47..126cb467f 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -18,6 +18,8 @@ namespace Jellyfin.Server
 
         public override bool CanSelfRestart => StartupOptions.RestartPath != null;
 
+        protected override bool SupportsDualModeSockets => true;
+
         protected override void RestartInternal() => Program.Restart();
 
         protected override IEnumerable<Assembly> GetAssembliesWithPartsInternal()
@@ -27,8 +29,6 @@ namespace Jellyfin.Server
 
         protected override void ShutdownInternal() => Program.Shutdown();
 
-        protected override bool SupportsDualModeSockets => true;
-
         protected override IHttpListener CreateHttpListener()
             => new WebSocketSharpListener(
                 Logger,
@@ -39,7 +39,6 @@ namespace Jellyfin.Server
                 CryptographyProvider,
                 SupportsDualModeSockets,
                 FileSystemManager,
-                EnvironmentInfo
-            );
+                EnvironmentInfo);
     }
 }
-- 
cgit v1.2.3