mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-29 17:02:05 +13:00
Error handling for thumbnail creation
This commit is contained in:
parent
184ed52bc5
commit
f6a22cf5b4
3 changed files with 686 additions and 2034 deletions
38
ShareX/Forms/TaskSettingsForm.Designer.cs
generated
38
ShareX/Forms/TaskSettingsForm.Designer.cs
generated
|
@ -115,8 +115,6 @@ private void InitializeComponent()
|
|||
this.chkUseDefaultCaptureSettings = new System.Windows.Forms.CheckBox();
|
||||
this.tpRegionCapture = new System.Windows.Forms.TabPage();
|
||||
this.pgRegionCapture = new System.Windows.Forms.PropertyGrid();
|
||||
this.tpRectangleAnnotate = new System.Windows.Forms.TabPage();
|
||||
this.pgRectangleAnnotate = new System.Windows.Forms.PropertyGrid();
|
||||
this.tpScreenRecorder = new System.Windows.Forms.TabPage();
|
||||
this.lblScreenRecorderStartDelay = new System.Windows.Forms.Label();
|
||||
this.chkScreenRecordAutoStart = new System.Windows.Forms.CheckBox();
|
||||
|
@ -135,6 +133,8 @@ private void InitializeComponent()
|
|||
this.cbScreenRecorderFixedDuration = new System.Windows.Forms.CheckBox();
|
||||
this.nudGIFFPS = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblGIFFPS = new System.Windows.Forms.Label();
|
||||
this.tpRectangleAnnotate = new System.Windows.Forms.TabPage();
|
||||
this.pgRectangleAnnotate = new System.Windows.Forms.PropertyGrid();
|
||||
this.tpActions = new System.Windows.Forms.TabPage();
|
||||
this.pActions = new System.Windows.Forms.Panel();
|
||||
this.btnActionsDuplicate = new System.Windows.Forms.Button();
|
||||
|
@ -202,12 +202,12 @@ private void InitializeComponent()
|
|||
((System.ComponentModel.ISupportInitialize)(this.nudScreenshotDelay)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudCaptureShadowOffset)).BeginInit();
|
||||
this.tpRegionCapture.SuspendLayout();
|
||||
this.tpRectangleAnnotate.SuspendLayout();
|
||||
this.tpScreenRecorder.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecordFPS)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderDuration)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderStartDelay)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudGIFFPS)).BeginInit();
|
||||
this.tpRectangleAnnotate.SuspendLayout();
|
||||
this.tpActions.SuspendLayout();
|
||||
this.pActions.SuspendLayout();
|
||||
this.tpWatchFolders.SuspendLayout();
|
||||
|
@ -893,20 +893,6 @@ private void InitializeComponent()
|
|||
this.pgRegionCapture.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.pgRegionCapture.ToolbarVisible = false;
|
||||
//
|
||||
// tpRectangleAnnotate
|
||||
//
|
||||
this.tpRectangleAnnotate.Controls.Add(this.pgRectangleAnnotate);
|
||||
resources.ApplyResources(this.tpRectangleAnnotate, "tpRectangleAnnotate");
|
||||
this.tpRectangleAnnotate.Name = "tpRectangleAnnotate";
|
||||
this.tpRectangleAnnotate.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// pgRectangleAnnotate
|
||||
//
|
||||
resources.ApplyResources(this.pgRectangleAnnotate, "pgRectangleAnnotate");
|
||||
this.pgRectangleAnnotate.Name = "pgRectangleAnnotate";
|
||||
this.pgRectangleAnnotate.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.pgRectangleAnnotate.ToolbarVisible = false;
|
||||
//
|
||||
// tpScreenRecorder
|
||||
//
|
||||
this.tpScreenRecorder.Controls.Add(this.lblScreenRecorderStartDelay);
|
||||
|
@ -1104,6 +1090,20 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.lblGIFFPS, "lblGIFFPS");
|
||||
this.lblGIFFPS.Name = "lblGIFFPS";
|
||||
//
|
||||
// tpRectangleAnnotate
|
||||
//
|
||||
this.tpRectangleAnnotate.Controls.Add(this.pgRectangleAnnotate);
|
||||
resources.ApplyResources(this.tpRectangleAnnotate, "tpRectangleAnnotate");
|
||||
this.tpRectangleAnnotate.Name = "tpRectangleAnnotate";
|
||||
this.tpRectangleAnnotate.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// pgRectangleAnnotate
|
||||
//
|
||||
resources.ApplyResources(this.pgRectangleAnnotate, "pgRectangleAnnotate");
|
||||
this.pgRectangleAnnotate.Name = "pgRectangleAnnotate";
|
||||
this.pgRectangleAnnotate.PropertySort = System.Windows.Forms.PropertySort.NoSort;
|
||||
this.pgRectangleAnnotate.ToolbarVisible = false;
|
||||
//
|
||||
// tpActions
|
||||
//
|
||||
this.tpActions.Controls.Add(this.pActions);
|
||||
|
@ -1211,12 +1211,12 @@ private void InitializeComponent()
|
|||
//
|
||||
// lvWatchFolderList
|
||||
//
|
||||
resources.ApplyResources(this.lvWatchFolderList, "lvWatchFolderList");
|
||||
this.lvWatchFolderList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.chWatchFolderFolderPath,
|
||||
this.chWatchFolderFilter,
|
||||
this.chWatchFolderIncludeSubdirectories});
|
||||
this.lvWatchFolderList.FullRowSelect = true;
|
||||
resources.ApplyResources(this.lvWatchFolderList, "lvWatchFolderList");
|
||||
this.lvWatchFolderList.Name = "lvWatchFolderList";
|
||||
this.lvWatchFolderList.UseCompatibleStateImageBehavior = false;
|
||||
this.lvWatchFolderList.View = System.Windows.Forms.View.Details;
|
||||
|
@ -1476,13 +1476,13 @@ private void InitializeComponent()
|
|||
((System.ComponentModel.ISupportInitialize)(this.nudScreenshotDelay)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudCaptureShadowOffset)).EndInit();
|
||||
this.tpRegionCapture.ResumeLayout(false);
|
||||
this.tpRectangleAnnotate.ResumeLayout(false);
|
||||
this.tpScreenRecorder.ResumeLayout(false);
|
||||
this.tpScreenRecorder.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecordFPS)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderDuration)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudScreenRecorderStartDelay)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudGIFFPS)).EndInit();
|
||||
this.tpRectangleAnnotate.ResumeLayout(false);
|
||||
this.tpActions.ResumeLayout(false);
|
||||
this.tpActions.PerformLayout();
|
||||
this.pActions.ResumeLayout(false);
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -29,6 +29,7 @@ You should have received a copy of the GNU General Public License
|
|||
using ShareX.ScreenCaptureLib;
|
||||
using ShareX.UploadersLib;
|
||||
using ShareX.UploadersLib.HelperClasses;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
|
@ -93,6 +94,10 @@ public static string CreateThumbnail(Image img, string folder, string filename,
|
|||
thumbImage.SaveJPG(thumbnailFilePath, 90);
|
||||
return thumbnailFilePath;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
DebugHelper.WriteException(e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (thumbImage != null)
|
||||
|
|
Loading…
Reference in a new issue