Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

3 files changed, 0 insertions, 39 deletions

diff --git a/MediaBrowser.ServerApplication/EntryPoints/ResourceEntryPoint.cs b/MediaBrowser.ServerApplication/EntryPoints/ResourceEntryPoint.cs
deleted file mode 100644
index e7a33d864..000000000
--- a/MediaBrowser.ServerApplication/EntryPoints/ResourceEntryPoint.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using MediaBrowser.Controller.Plugins;
-using System;
-using System.Threading;
-
-namespace MediaBrowser.ServerApplication.EntryPoints
-{
-    public class ResourceEntryPoint : IServerEntryPoint
-    {
-        private Timer _timer;
-
-        public void Run()
-        {
-            _timer = new Timer(TimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
-        }
-
-        private void TimerCallback(object state)
-        {
-            try
-            {
-                // Bad practice, i know. But we keep a lot in memory, unfortunately.
-                GC.Collect(2, GCCollectionMode.Forced, true);
-                GC.Collect(2, GCCollectionMode.Forced, true);
-            }
-            catch
-            {
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_timer != null)
-            {
-                _timer.Dispose();
-                _timer = null;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 9b20ac717..c0830c8c9 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -99,7 +99,6 @@
     <Compile Include="BackgroundServiceInstaller.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="EntryPoints\ResourceEntryPoint.cs" />
     <Compile Include="Native\NativeFileSystem.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
diff --git a/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png b/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
index db63264c5..20c3b9c83 100644
--- a/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
+++ b/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png