From 0a91bcf662047f77fc91eeb31ad209a2bcf6bd45 Mon Sep 17 00:00:00 2001 From: Kenneth Hsu Date: Mon, 17 Feb 2020 09:34:39 -0800 Subject: [PATCH] Fix path to SQLite.Interop.dll. This assembly lives in the win32 and win64 subdirectories, and not in the base path. This fixes #4093. --- Duplicati/Library/SQLiteHelper/SQLiteLoader.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Duplicati/Library/SQLiteHelper/SQLiteLoader.cs b/Duplicati/Library/SQLiteHelper/SQLiteLoader.cs index 68697039c..4a752af16 100644 --- a/Duplicati/Library/SQLiteHelper/SQLiteLoader.cs +++ b/Duplicati/Library/SQLiteHelper/SQLiteLoader.cs @@ -19,8 +19,8 @@ #endregion using System; using System.IO; -using Duplicati.Library.Common; - +using Duplicati.Library.Common; + namespace Duplicati.Library.SQLiteHelper { public static class SQLiteLoader @@ -189,8 +189,8 @@ namespace Duplicati.Library.SQLiteHelper // This can be avoided if the preload in SQLite works, but it is easy to do it here as well if (loadMixedModeAssembly) { - try { PInvoke.LoadLibraryEx(Path.Combine(basePath, "SQLite.Interop.dll"), IntPtr.Zero, 0); } - catch (Exception ex) { Logging.Log.WriteExplicitMessage(LOGTAG, "LoadMixedModeSQLiteError", ex, "Failed to load the mixed mode SQLite database: {0}", Path.Combine(basePath, "SQLite.Interop.dll")); } + try { PInvoke.LoadLibraryEx(Path.Combine(assemblyPath, "SQLite.Interop.dll"), IntPtr.Zero, 0); } + catch (Exception ex) { Logging.Log.WriteExplicitMessage(LOGTAG, "LoadMixedModeSQLiteError", ex, "Failed to load the mixed mode SQLite database: {0}", Path.Combine(assemblyPath, "SQLite.Interop.dll")); } } } else