From 58bb22df90653bcd3980701dffaa77cb6970efb3 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Tue, 20 May 2025 11:15:09 +0200
Subject: [PATCH] ensure remove picture box also on the same image

---
 .../RadPictureBoxElement_PasteImageFixes.cs                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs b/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs
index 7b6bbc4..50637a9 100644
--- a/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs
+++ b/Pilz.UI.Telerik/Patches/TelerikUiForWinForms/RadPictureBoxElement_PasteImageFixes.cs
@@ -21,14 +21,14 @@ public class RadPictureBoxElement_PasteImageFixes
 
     public static void Postfix(object __instance)
     {
-        if (__instance is RadPictureBoxElement pb && images.TryGetValue(pb, out var image) && pb.Image != image)
+        if (__instance is RadPictureBoxElement pb && images.TryGetValue(pb, out var image))
         {
             // Remove first to avoid conflicts on error
             images.Remove(pb);
 
             // Call "OnImageLoaded"
-            var method = typeof(RadPictureBoxElement).GetMethod("OnImageLoaded", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
-            method.Invoke(pb, null);
+            if (pb.Image != image)
+                typeof(RadPictureBoxElement).GetMethod("OnImageLoaded", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic)?.Invoke(pb, null);
         }
     }
 }