Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

1 files changed, 11 insertions, 3 deletions

diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index bad1aaf35..bff342d01 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -1,11 +1,11 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Net;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Startup.Common;
 using MediaBrowser.ServerApplication.Networking;
 using System.Collections.Generic;
 using System.Reflection;
+using CommonIO;
 
 namespace MediaBrowser.ServerApplication.Native
 {
@@ -22,7 +22,10 @@ namespace MediaBrowser.ServerApplication.Native
         {
             var list = new List<Assembly>();
 
-            list.Add(typeof(PismoIsoManager).Assembly);
+            if (!System.Environment.Is64BitProcess)
+            {
+                list.Add(typeof(PismoIsoManager).Assembly);
+            }
 
             list.Add(GetType().Assembly);
             
@@ -47,6 +50,11 @@ namespace MediaBrowser.ServerApplication.Native
             }
         }
 
+        public bool SupportsLibraryMonitor
+        {
+            get { return true; }
+        }
+
         public bool SupportsRunningAsService
         {
             get