From 1ed25ebd9a11f3fc1838e347a34621dcde0b7bd5 Mon Sep 17 00:00:00 2001
From: Greenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 16 Dec 2020 22:36:25 +0000
Subject: Corrections as recommended.

---
 Jellyfin.Api/Controllers/PluginsController.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'Jellyfin.Api/Controllers/PluginsController.cs')

diff --git a/Jellyfin.Api/Controllers/PluginsController.cs b/Jellyfin.Api/Controllers/PluginsController.cs
index 4f65e18e1..6db74571c 100644
--- a/Jellyfin.Api/Controllers/PluginsController.cs
+++ b/Jellyfin.Api/Controllers/PluginsController.cs
@@ -217,8 +217,13 @@ namespace Jellyfin.Api.Controllers
                 plugin = plugins.OrderBy(p => p.Manifest.Status).FirstOrDefault();
             }
 
-            _installationManager.UninstallPlugin(plugin!);
-            return NoContent();
+            if (plugin != null)
+            {
+                _installationManager.UninstallPlugin(plugin!);
+                return NoContent();
+            }
+
+            return NotFound();
         }
 
         /// <summary>
@@ -303,10 +308,7 @@ namespace Jellyfin.Api.Controllers
                 || plugin.Manifest.ImageUrl == null
                 || !System.IO.File.Exists(imgPath))
             {
-                // Use a blank image.
-                var type = GetType();
-                var stream = type.Assembly.GetManifestResourceStream(type.Namespace + ".Plugins.blank.png");
-                return File(stream, "image/png");
+                return NotFound();
             }
 
             imgPath = Path.Combine(plugin.Path, plugin.Manifest.ImageUrl);
@@ -333,7 +335,7 @@ namespace Jellyfin.Api.Controllers
 
             if (plugin != null)
             {
-                return Ok(plugin.Manifest);
+                return plugin.Manifest;
             }
 
             return NotFound();
-- 
cgit v1.2.3