From 98dcab13af3a2bce79329c90788b577c4dea845c Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 31 Dec 2022 13:25:32 +0300
Subject: [PATCH] fixed #6664: Handle clipboard viewer crash

---
 ShareX.HelpersLib/Forms/ClipboardViewerForm.cs          | 9 ++++-----
 ShareX.HelpersLib/Forms/ClipboardViewerForm.designer.cs | 1 +
 ShareX.HelpersLib/Forms/ClipboardViewerForm.resx        | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ShareX.HelpersLib/Forms/ClipboardViewerForm.cs b/ShareX.HelpersLib/Forms/ClipboardViewerForm.cs
index e9ec0bee3..b44abc5f6 100644
--- a/ShareX.HelpersLib/Forms/ClipboardViewerForm.cs
+++ b/ShareX.HelpersLib/Forms/ClipboardViewerForm.cs
@@ -38,7 +38,10 @@ public ClipboardViewerForm()
         {
             InitializeComponent();
             ShareXResources.ApplyTheme(this);
+        }
 
+        private void ClipboardViewerForm_Load(object sender, EventArgs e)
+        {
             RefreshClipboardContentList();
         }
 
@@ -85,11 +88,7 @@ private void UpdateSelectedClipboardContent()
                 {
                     object data = CurrentDataObject.GetData(format);
 
-                    if (data == null)
-                    {
-                        RefreshClipboardContentList();
-                    }
-                    else
+                    if (data != null)
                     {
                         try
                         {
diff --git a/ShareX.HelpersLib/Forms/ClipboardViewerForm.designer.cs b/ShareX.HelpersLib/Forms/ClipboardViewerForm.designer.cs
index 53186f3be..82dec8f9b 100644
--- a/ShareX.HelpersLib/Forms/ClipboardViewerForm.designer.cs
+++ b/ShareX.HelpersLib/Forms/ClipboardViewerForm.designer.cs
@@ -97,6 +97,7 @@ private void InitializeComponent()
             this.Controls.Add(this.txtSelectedClipboardContent);
             this.DoubleBuffered = true;
             this.Name = "ClipboardViewerForm";
+            this.Load += new System.EventHandler(this.ClipboardViewerForm_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
 
diff --git a/ShareX.HelpersLib/Forms/ClipboardViewerForm.resx b/ShareX.HelpersLib/Forms/ClipboardViewerForm.resx
index 861f937f5..fe1fdc650 100644
--- a/ShareX.HelpersLib/Forms/ClipboardViewerForm.resx
+++ b/ShareX.HelpersLib/Forms/ClipboardViewerForm.resx
@@ -247,7 +247,7 @@
     <value>pbSelectedClipboardContent</value>
   </data>
   <data name="&gt;&gt;pbSelectedClipboardContent.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=14.1.4.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;pbSelectedClipboardContent.Parent" xml:space="preserve">
     <value>$this</value>
@@ -264,9 +264,6 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>784, 561</value>
   </data>
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>