github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Windows-Capture exception, which was unfortunately added when fixing a focus issue.

Browse source
This commit is contained in:
RKrom 2014-12-22 21:02:57 +01:00
commit b4b6c6546d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Greenshot/Forms/ImageEditorForm.cs
View file

@ -1245,11 +1245,12 @@ namespace Greenshot {
windowToCapture = CaptureHelper.SelectCaptureWindow(windowToCapture); windowToCapture = CaptureHelper.SelectCaptureWindow(windowToCapture);
if (windowToCapture != null) { if (windowToCapture != null) {
capture = CaptureHelper.CaptureWindow(windowToCapture, capture, coreConfiguration.WindowCaptureMode); capture = CaptureHelper.CaptureWindow(windowToCapture, capture, coreConfiguration.WindowCaptureMode);
Activate(); if (capture != null && capture.CaptureDetails != null && capture.Image != null) {
WindowDetails.ToForeground(Handle); ((Bitmap)capture.Image).SetResolution(capture.CaptureDetails.DpiX, capture.CaptureDetails.DpiY);
if (capture!= null && capture.Image != null) {
surface.AddImageContainer((Bitmap)capture.Image, 100, 100); surface.AddImageContainer((Bitmap)capture.Image, 100, 100);
} }
Activate();
WindowDetails.ToForeground(Handle);
} }
if (capture!= null) { if (capture!= null) {

1
Greenshot/Helpers/CaptureHelper.cs
View file

@ -932,7 +932,6 @@ namespace Greenshot.Helpers {
if (windowToCapture != null) { if (windowToCapture != null) {
captureForWindow.CaptureDetails.Title = windowToCapture.Text; captureForWindow.CaptureDetails.Title = windowToCapture.Text;
} }
((Bitmap)captureForWindow.Image).SetResolution(captureForWindow.CaptureDetails.DpiX, captureForWindow.CaptureDetails.DpiY);
} }
return captureForWindow; return captureForWindow;