Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2879 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2017-09-12 02:28:16 -04:00 committed by GitHub
parent 4f3eef77b6 ca1ab81d3c
commit 89d678384f
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Emby.Server.Implementations/ApplicationHost.cs
View file

@ -1032,7 +1032,7 @@ namespace Emby.Server.Implementations
((UserManager)UserManager).Initialize();
}
protected virtual string PackageRuntime
public virtual string PackageRuntime
{
get
{

4
Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View file

@ -84,8 +84,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
private void ProcessContext(HttpListenerContext context)
{
InitTask(context, _disposeCancellationToken);
//Task.Run(() => InitTask(context, _disposeCancellationToken));
//InitTask(context, _disposeCancellationToken);
Task.Run(() => InitTask(context, _disposeCancellationToken));
}
private Task InitTask(HttpListenerContext context, CancellationToken cancellationToken)

3
Emby.Server.Implementations/Library/UserManager.cs
View file

@ -666,8 +666,7 @@ namespace Emby.Server.Implementations.Library
DeleteUserPolicy(user);
// Force this to be lazy loaded again
Users = LoadUsers();
Users = allUsers.Where(i => i.Id != user.Id).ToList();
OnUserDeleted(user);
}

2
MediaBrowser.Controller/IServerApplicationHost.cs
View file

@ -84,5 +84,7 @@ namespace MediaBrowser.Controller
void LaunchUrl(string url);
void EnableLoopback(string appName);
string PackageRuntime { get; }
}
}

2
SharedVersion.cs
View file

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.30.17")]
[assembly: AssemblyVersion("3.2.30.18")]