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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Luke Pulverenti 2014-02-28 23:13:51 -05:00
parent e551322347 604f971477
commit 0d4e042d89
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs
View file

@ -47,7 +47,7 @@ namespace MediaBrowser.Common.Implementations.Updates
File.Copy(source, Path.Combine(Path.GetTempPath(), "SharpCompress.dll"), true);
logger.Info("Starting updater process.");
Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath={5}", product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath));
Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\"", product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath));
// That's it. The installer will do the work once we exit
}

4
MediaBrowser.Controller/Entities/CollectionFolder.cs
View file

@ -149,7 +149,7 @@ namespace MediaBrowser.Controller.Entities
try
{
locationsDicionary = PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
locationsDicionary = PhysicalLocations.Distinct().ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{
@ -181,7 +181,7 @@ namespace MediaBrowser.Controller.Entities
try
{
locationsDicionary = PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
locationsDicionary = PhysicalLocations.Distinct().ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{