mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
ecb89c3d1d
@ -462,5 +462,16 @@ namespace MediaBrowser.Common.Kernel
|
|||||||
/// <value>The resource pools.</value>
|
/// <value>The resource pools.</value>
|
||||||
public ResourcePool ResourcePools { get; set; }
|
public ResourcePool ResourcePools { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Removes the plugin.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="plugin">The plugin.</param>
|
||||||
|
public void RemovePlugin(IPlugin plugin)
|
||||||
|
{
|
||||||
|
var list = Plugins.ToList();
|
||||||
|
list.Remove(plugin);
|
||||||
|
Plugins = list;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -123,5 +123,12 @@ namespace MediaBrowser.Common.Kernel
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The resource pools.</value>
|
/// <value>The resource pools.</value>
|
||||||
ResourcePool ResourcePools { get; set; }
|
ResourcePool ResourcePools { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Removes the plugin.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="plugin">The plugin.</param>
|
||||||
|
void RemovePlugin(IPlugin plugin);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -536,17 +536,6 @@ namespace MediaBrowser.Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Removes the plugin.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="plugin">The plugin.</param>
|
|
||||||
internal void RemovePlugin(IPlugin plugin)
|
|
||||||
{
|
|
||||||
var list = Plugins.ToList();
|
|
||||||
list.Remove(plugin);
|
|
||||||
Plugins = list;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the system info.
|
/// Gets the system info.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user