From 2750cb75dd80ca96b55d7d39c766dce09817a4fd Mon Sep 17 00:00:00 2001
From: ema <mccoy39082@163.com>
Date: Tue, 1 Jul 2025 03:10:33 +0800
Subject: [PATCH] Fix exception from SVG WebView2

---
 .../QuickLook.Plugin.ImageViewer/MetaProvider.cs     | 11 ++++-------
 .../QuickLook.Plugin.ImageViewer/SvgImagePanel.cs    | 12 ++++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/MetaProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/MetaProvider.cs
index 16c159d..d24f6f0 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/MetaProvider.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/MetaProvider.cs
@@ -80,15 +80,12 @@ public class MetaProvider
             return new Size(w, h);
 
         // fallback
-
         try
         {
-            using (var mi = new MagickImage())
-            {
-                mi.Ping(_path);
-                w = (int)mi.Width;
-                h = (int)mi.Height;
-            }
+            using var mi = new MagickImage();
+            mi.Ping(_path);
+            w = (int)mi.Width;
+            h = (int)mi.Height;
         }
         catch
         {
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/SvgImagePanel.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/SvgImagePanel.cs
index ffe43f2..509a1a1 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/SvgImagePanel.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/SvgImagePanel.cs
@@ -44,12 +44,12 @@ public class SvgImagePanel : WebpagePanel
         set
         {
             _objectForScripting = value;
-
-            Dispatcher.Invoke(async () =>
-            {
-                await _webView.EnsureCoreWebView2Async();
-                _webView.CoreWebView2.AddHostObjectToScript("external", value);
-            });
+            _webView?.EnsureCoreWebView2Async()
+                .ContinueWith(_ =>
+                    _webView?.Dispatcher.Invoke(() =>
+                        _webView?.CoreWebView2.AddHostObjectToScript("external", value)
+                    )
+                );
         }
     }