aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-10-13 17:14:17 -0400
committerGitHub <noreply@github.com>2016-10-13 17:14:17 -0400
commit1c169b5b407c662a8ac0aa0f10bd37ce72e62901 (patch)
tree4a888f17d281440df8b6bb14422d5b6192943c68 /MediaBrowser.Common.Implementations/BaseApplicationHost.cs
parent91e877a88e88a979cfe3aab128261594e251220c (diff)
parente206725b734f9a6226faa78ff2d0ecd2f551acc1 (diff)
Merge pull request #2231 from MediaBrowser/dev
update images
Diffstat (limited to 'MediaBrowser.Common.Implementations/BaseApplicationHost.cs')
-rw-r--r--MediaBrowser.Common.Implementations/BaseApplicationHost.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 4099c9c56..e68fee829 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -234,7 +234,14 @@ namespace MediaBrowser.Common.Implementations
JsonSerializer = CreateJsonSerializer();
- MemoryStreamProvider = new MemoryStreamProvider();
+ if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+ {
+ MemoryStreamProvider = new RecyclableMemoryStreamProvider();
+ }
+ else
+ {
+ MemoryStreamProvider = new MemoryStreamProvider();
+ }
OnLoggerLoaded(true);
LogManager.LoggerLoaded += (s, e) => OnLoggerLoaded(false);