diff options
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 5 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Emby.Server.Implementations.csproj | 1 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Logging/SimpleLogManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs (renamed from Emby.Server.Implementations/IO/LnkShortcutHandler.cs) | 2 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/WindowsAppHost.cs | 1 |
6 files changed, 4 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index bc88d652c..39b554afe 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)); } diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 1e897016e..2a45fb315 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -133,7 +133,6 @@ <Compile Include="IO\FileRefresher.cs" /> <Compile Include="IO\IsoManager.cs" /> <Compile Include="IO\LibraryMonitor.cs" /> - <Compile Include="IO\LnkShortcutHandler.cs" /> <Compile Include="IO\ManagedFileSystem.cs" /> <Compile Include="IO\MbLinkShortcutHandler.cs" /> <Compile Include="IO\MemoryStreamProvider.cs" /> diff --git a/Emby.Server.Implementations/Logging/SimpleLogManager.cs b/Emby.Server.Implementations/Logging/SimpleLogManager.cs index 5c83766fe..6d1c5b837 100644 --- a/Emby.Server.Implementations/Logging/SimpleLogManager.cs +++ b/Emby.Server.Implementations/Logging/SimpleLogManager.cs @@ -122,7 +122,7 @@ namespace Emby.Server.Implementations.Logging { Directory.CreateDirectory(Path.GetDirectoryName(path)); - _fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read); + _fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read, 32768); _cancellationTokenSource = new CancellationTokenSource(); Task.Factory.StartNew(LogInternal, _cancellationTokenSource.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default); diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 2ee2acfc2..15abaaa62 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -122,6 +122,7 @@ </Compile> <Compile Include="ImageEncoderHelper.cs" /> <Compile Include="MainStartup.cs" /> + <Compile Include="Native\LnkShortcutHandler.cs" /> <Compile Include="Native\LoopUtil.cs" /> <Compile Include="Native\PowerManagement.cs" /> <Compile Include="Native\Standby.cs" /> diff --git a/Emby.Server.Implementations/IO/LnkShortcutHandler.cs b/MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs index 093d57aa4..e53a79670 100644 --- a/Emby.Server.Implementations/IO/LnkShortcutHandler.cs +++ b/MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices.ComTypes; using System.Text; using MediaBrowser.Model.IO; -namespace Emby.Server.Implementations.IO +namespace MediaBrowser.ServerApplication.Native { public class LnkShortcutHandler :IShortcutHandler { diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs index d72bd532e..a6664c42f 100644 --- a/MediaBrowser.ServerApplication/WindowsAppHost.cs +++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs @@ -28,6 +28,7 @@ namespace MediaBrowser.ServerApplication public WindowsAppHost(ServerApplicationPaths applicationPaths, ILogManager logManager, StartupOptions options, IFileSystem fileSystem, IPowerManagement powerManagement, string releaseAssetFilename, IEnvironmentInfo environmentInfo, MediaBrowser.Controller.Drawing.IImageEncoder imageEncoder, ISystemEvents systemEvents, MediaBrowser.Common.Net.INetworkManager networkManager) : base(applicationPaths, logManager, options, fileSystem, powerManagement, releaseAssetFilename, environmentInfo, imageEncoder, systemEvents, networkManager) { + fileSystem.AddShortcutHandler(new LnkShortcutHandler()); } public override bool IsRunningAsService |