diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-19 18:42:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 18:42:31 -0400 |
| commit | 1c494519c10f7aad08783c28348f6872023126d5 (patch) | |
| tree | 5aef83c994b7074b6889f601c4af46f3a686502d /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | c58db90c950c766321615eca236557d87b8d1b74 (diff) | |
| parent | a02968c568c97da544b239014506a03ecca35c09 (diff) | |
Merge pull request #2833 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index bc88d652c..ea6c2aaf5 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -424,11 +424,6 @@ namespace Emby.Server.Implementations SetBaseExceptionMessage(); - if (environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows) - { - fileSystem.AddShortcutHandler(new LnkShortcutHandler()); - } - fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem)); } @@ -1858,9 +1853,9 @@ namespace Emby.Server.Implementations HasPendingRestart = HasPendingRestart, Version = ApplicationVersion.ToString(), WebSocketPortNumber = HttpPort, - FailedPluginAssemblies = FailedAssemblies.ToList(), - InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToList(), - CompletedInstallations = InstallationManager.CompletedInstallations.ToList(), + FailedPluginAssemblies = FailedAssemblies.ToArray(), + InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToArray(), + CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(), Id = SystemId, ProgramDataPath = ApplicationPaths.ProgramDataPath, LogPath = ApplicationPaths.LogDirectoryPath, |