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

rework transitions

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-23 23:06:51 -04:00
parent a518e50185
commit abb3c8a1d3
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
MediaBrowser.ServerApplication/MainStartup.cs
View file

@ -254,7 +254,7 @@ namespace MediaBrowser.ServerApplication
{ {
Task.WaitAll(task); Task.WaitAll(task);
task = InstallVcredistIfNeeded(_appHost, _logger); task = InstallVcredist2013IfNeeded(_appHost, _logger);
Task.WaitAll(task); Task.WaitAll(task);
task = InstallFrameworkV46IfNeeded(_logger); task = InstallFrameworkV46IfNeeded(_logger);
@ -679,7 +679,7 @@ namespace MediaBrowser.ServerApplication
} }
} }
private static async Task InstallVcredistIfNeeded(ApplicationHost appHost, ILogger logger) private static async Task InstallVcredist2013IfNeeded(ApplicationHost appHost, ILogger logger)
{ {
try try
{ {
@ -693,7 +693,7 @@ namespace MediaBrowser.ServerApplication
try try
{ {
await InstallVcredist().ConfigureAwait(false); await InstallVcredist2013().ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -701,13 +701,13 @@ namespace MediaBrowser.ServerApplication
} }
} }
private async static Task InstallVcredist() private async static Task InstallVcredist2013()
{ {
var httpClient = _appHost.HttpClient; var httpClient = _appHost.HttpClient;
var tmp = await httpClient.GetTempFile(new HttpRequestOptions var tmp = await httpClient.GetTempFile(new HttpRequestOptions
{ {
Url = GetVcredistUrl(), Url = GetVcredist2013Url(),
Progress = new Progress<double>() Progress = new Progress<double>()
}).ConfigureAwait(false); }).ConfigureAwait(false);
@ -733,7 +733,7 @@ namespace MediaBrowser.ServerApplication
} }
} }
private static string GetVcredistUrl() private static string GetVcredist2013Url()
{ {
if (Environment.Is64BitProcess) if (Environment.Is64BitProcess)
{ {

2
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View file

@ -274,7 +274,7 @@ namespace MediaBrowser.WebDashboard.Api
} }
var mainFile = File.ReadAllText(GetDashboardResourcePath("index.html")); var mainFile = File.ReadAllText(GetDashboardResourcePath("index.html"));
html = ReplaceFirst(mainFile, "<div class=\"mainAnimatedPage hide\"></div>", "<div class=\"mainAnimatedPage hide\">" + html + "</div>"); html = ReplaceFirst(mainFile, "<div class=\"mainAnimatedPages skinBody\"></div>", "<div class=\"mainAnimatedPages skinBody hide\">" + html + "</div>");
} }
if (!string.IsNullOrWhiteSpace(localizationCulture)) if (!string.IsNullOrWhiteSpace(localizationCulture))