mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-24 01:00:27 +12:00
fixed #6664: Handle clipboard viewer crash
This commit is contained in:
parent
659fd4df6e
commit
98dcab13af
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -247,7 +247,7 @@
|
|||
<value>pbSelectedClipboardContent</value>
|
||||
</data>
|
||||
<data name=">>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=">>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>
|
||||
|
|
Loading…
Reference in a new issue