Merge pull request #2668 from MediaBrowser/dev

Dev

1 files changed, 2 insertions, 16 deletions

diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index a9aed0fce..af6e00e25 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -42,7 +42,6 @@ namespace MediaBrowser.Server.Mono
             var applicationPath = Assembly.GetEntryAssembly().Location;
             var appFolderPath = Path.GetDirectoryName(applicationPath);
 
-            TryCopySqliteConfigFile(appFolderPath);
             SetSqliteProvider();
 
             var options = new StartupOptions(Environment.GetCommandLineArgs());
@@ -74,20 +73,6 @@ namespace MediaBrowser.Server.Mono
             }
         }
 
-        private static void TryCopySqliteConfigFile(string appFolderPath)
-        {
-            try
-            {
-                File.Copy(Path.Combine(appFolderPath, "System.Data.SQLite.dll.config"),
-                    Path.Combine(appFolderPath, "SQLitePCLRaw.provider.sqlite3.dll.config"),
-                    true);
-            }
-            catch
-            {
-                
-            }
-        }
-
         private static void SetSqliteProvider()
         {
             SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
@@ -260,7 +245,8 @@ namespace MediaBrowser.Server.Mono
             {
                 var message = LogHelper.GetLogMessage(exception).ToString();
 
-                if (message.IndexOf("InotifyWatcher", StringComparison.OrdinalIgnoreCase) == -1)
+                if (message.IndexOf("InotifyWatcher", StringComparison.OrdinalIgnoreCase) == -1 &&
+                    message.IndexOf("_IOCompletionCallback", StringComparison.OrdinalIgnoreCase) == -1)
                 {
                     Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
                 }