aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs13
-rw-r--r--MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj2
2 files changed, 12 insertions, 3 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 07af1f2e9..f19d8526c 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -324,6 +324,15 @@ namespace MediaBrowser.ServerApplication
{
// Not there, no big deal
}
+
+ try
+ {
+ Directory.Delete(Path.Combine(ApplicationPaths.DataPath, "tmdb-movies"), true);
+ }
+ catch (IOException)
+ {
+ // Not there, no big deal
+ }
});
}
@@ -457,6 +466,8 @@ namespace MediaBrowser.ServerApplication
await Task.WhenAll(itemsTask, displayPreferencesTask, userdataTask).ConfigureAwait(false);
progress.Report(100);
+ SetStaticProperties();
+
await ((UserManager)UserManager).Initialize().ConfigureAwait(false);
SetKernelProperties();
@@ -490,8 +501,6 @@ namespace MediaBrowser.ServerApplication
private void SetKernelProperties()
{
LocalizedStrings.StringFiles = GetExports<LocalizedStringData>();
-
- SetStaticProperties();
}
/// <summary>
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 5395167b9..b58899740 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -149,7 +149,7 @@
<ItemGroup>
<None Include="App.config" />
<None Include="app.manifest" />
- <None Include="Native\RegisterServer.bat" />
+ <EmbeddedResource Include="Native\RegisterServer.bat" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>