Cache connection and clear pool after all operations to avoid ObjectDisposedException

Author: Jack251970

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

@@ -155,6 +155,9 @@ private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
             return;
         }
 
+        // Cache connection for pool clean
+        SqliteConnection connection1 = null;
+
         try
         {
             // Since some bookmarks may have same favicon id, we need to record them to avoid duplicates
@@ -216,8 +219,9 @@ ORDER BY b.width DESC
                 }
                 finally
                 {
-                    // https://github.com/dotnet/efcore/issues/26580
-                    SqliteConnection.ClearPool(connection);
+                    // Cache connection and clear pool after all operations to avoid issue:
+                    // ObjectDisposedException: Safe handle has been closed.
+                    connection1 = connection;
                     connection.Close();
                     connection.Dispose();
                 }
@@ -231,6 +235,11 @@ ORDER BY b.width DESC
         // Delete temporary file
         try
         {
+            // https://github.com/dotnet/efcore/issues/26580
+            if (connection1 != null)
+            {
+                SqliteConnection.ClearPool(connection1);
+            }
             File.Delete(tempDbPath);
         }
         catch (Exception ex)

Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs

@@ -142,6 +142,9 @@ private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
             return;
         }
 
+        // Cache connection for pool clean
+        SqliteConnection connection1 = null;
+
         try
         {
             // Since some bookmarks may have same favicon id, we need to record them to avoid duplicates
@@ -212,8 +215,9 @@ ORDER BY i.width DESC  -- Select largest icon available
                 }
                 finally
                 {
-                    // https://github.com/dotnet/efcore/issues/26580
-                    SqliteConnection.ClearPool(connection);
+                    // Cache connection and clear pool after all operations to avoid issue:
+                    // ObjectDisposedException: Safe handle has been closed.
+                    connection1 = connection;
                     connection.Close();
                     connection.Dispose();
                 }
@@ -227,6 +231,11 @@ ORDER BY i.width DESC  -- Select largest icon available
         // Delete temporary file
         try
         {
+            // https://github.com/dotnet/efcore/issues/26580
+            if (connection1 != null)
+            {
+                SqliteConnection.ClearPool(connection1);
+            }
             File.Delete(tempDbPath);
         }
         catch (Exception ex)