Thread safety of image copying

QL-Win · Jan 5, 2025 · 612fb36 · 612fb36
1 parent 0d1ff89
commit 612fb36
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/NativeMethods/ClipboardEx.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/NativeMethods/ClipboardEx.cs
@@ -21,9 +21,7 @@ public static void SetClipboardImage(this BitmapSource img)
         var thread = new Thread((img) =>
         {
             if (img == null)
-            {
                 return;
-            }
 
             var image = (BitmapSource)img;
 
@@ -36,15 +34,16 @@ public static void SetClipboardImage(this BitmapSource img)
             try
             {
                 using var pngMemStream = new MemoryStream();
-                using var bitmpa = image.ToBitmap();
+                using var bitmpa = image.Dispatcher?.Invoke(() => image.ToBitmap()) ?? image.ToBitmap();
                 var data = new DataObject();
 
                 bitmpa.Save(pngMemStream, ImageFormat.Png);
                 data.SetData("PNG", pngMemStream, false);
 
                 Clipboard.SetDataObject(data, true);
             }
-            catch { }
+            catch { } // Clipboard competition leading to failure is common
+                      // There is currently no UI notification of success or failure
         });
         thread.SetApartmentState(ApartmentState.STA);
         thread.Start(img);