CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-15 11:26:36 +12:00
Code Issues Packages Projects Releases Wiki Activity

Scrolling capture output image won't scroll when updating values with control, if image crop failed then ignore it

Browse source
This commit is contained in:
Jaex 2015-09-29 15:57:26 +03:00
parent 578354c7eb
commit e89aa418da
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
View file

@ -266,13 +266,14 @@ private void Clean()
} }
} }
private void CleanPictureBox() private void CleanPictureBox(Image img = null)
{ {
Image temp = pbOutput.Image; Image temp = pbOutput.Image;
pbOutput.Image = img;
if (temp != null) if (temp != null)
{ {
pbOutput.Image = null;
temp.Dispose(); temp.Dispose();
} }
} }
@ -534,8 +535,8 @@ private void CombineAndPreviewImagesFromControl()
{ {
if (!isBusy) if (!isBusy)
{ {
CleanPictureBox(); Result = CombineImages();
CombineAndPreviewImages(); CleanPictureBox(Result);
} }
} }
@ -582,6 +583,11 @@ private Image CombineImages()
} }
newImage = ImageHelpers.CropImage(image, rect); newImage = ImageHelpers.CropImage(image, rect);
if (newImage == null)
{
continue;
}
} }
if (newImage == null) if (newImage == null)