Merge pull request #2567 from MediaBrowser/beta

Beta

1 files changed, 7 insertions, 1 deletions

diff --git a/Emby.Server.Core/IO/LibraryMonitor.cs b/Emby.Server.Core/IO/LibraryMonitor.cs
index e1e3186c3..ae7b66597 100644
--- a/Emby.Server.Core/IO/LibraryMonitor.cs
+++ b/Emby.Server.Core/IO/LibraryMonitor.cs
@@ -166,7 +166,11 @@ namespace Emby.Server.Core.IO
         private void Restart()
         {
             Stop();
-            Start();
+
+            if (!_disposed)
+            {
+                Start();
+            }
         }
 
         private bool IsLibraryMonitorEnabaled(BaseItem item)
@@ -589,11 +593,13 @@ namespace Emby.Server.Core.IO
             }
         }
 
+        private bool _disposed;
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
+            _disposed = true;
             Dispose(true);
             GC.SuppressFinalize(this);
         }