aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-12-29 12:07:29 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-12-29 12:07:29 -0500
commit04d1a53d199bbf5fced102daae77b3ef0d64474d (patch)
tree59a6e7c153187bb2bd163edd55364d06f619838c /MediaBrowser.ServerApplication
parent30b29f63c470eb0e92c53ad7df67d6bcf8a25914 (diff)
don't persist lazy loaded paths
Diffstat (limited to 'MediaBrowser.ServerApplication')
-rw-r--r--MediaBrowser.ServerApplication/App.config3
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs3
2 files changed, 3 insertions, 3 deletions
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)
{