From 04d1a53d199bbf5fced102daae77b3ef0d64474d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Dec 2013 12:07:29 -0500
Subject: don't persist lazy loaded paths

---
 MediaBrowser.ServerApplication/App.config         | 3 +--
 MediaBrowser.ServerApplication/ApplicationHost.cs | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config
index 217d3d276..53788e09a 100644
--- a/MediaBrowser.ServerApplication/App.config
+++ b/MediaBrowser.ServerApplication/App.config
@@ -11,8 +11,7 @@
   </nlog>
   <appSettings>
     <add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
-    <add key="ReleaseProgramDataPath" value="%ApplicationData%" />
-    <add key="ProgramDataFolderName" value="MediaBrowser-Server" />
+    <add key="ReleaseProgramDataPath" value="%ApplicationData%\MediaBrowser-Server" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 935067a33..514fbe6c1 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -590,7 +590,8 @@ namespace MediaBrowser.ServerApplication
             {
                 return Directory.EnumerateFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.TopDirectoryOnly)
                     .Select(LoadAssembly)
-                    .Where(a => a != null);
+                    .Where(a => a != null)
+                    .ToList();
             }
             catch (DirectoryNotFoundException)
             {
-- 
cgit v1.2.3