From b4b6c6546d12d1011a2ab5f94457a488a8948252 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Mon, 22 Dec 2014 21:02:57 +0100
Subject: [PATCH] Fix for Windows-Capture exception, which was unfortunately
 added when fixing a focus issue.

---
 Greenshot/Forms/ImageEditorForm.cs | 7 ++++---
 Greenshot/Helpers/CaptureHelper.cs | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs
index f5f09e565..f938935da 100644
--- a/Greenshot/Forms/ImageEditorForm.cs
+++ b/Greenshot/Forms/ImageEditorForm.cs
@@ -1245,11 +1245,12 @@ namespace Greenshot {
 				windowToCapture = CaptureHelper.SelectCaptureWindow(windowToCapture);
 				if (windowToCapture != null) {
 					capture = CaptureHelper.CaptureWindow(windowToCapture, capture, coreConfiguration.WindowCaptureMode);
-					Activate();
-					WindowDetails.ToForeground(Handle);
-					if (capture!= null && capture.Image != null) {
+					if (capture != null && capture.CaptureDetails != null && capture.Image != null) {
+						((Bitmap)capture.Image).SetResolution(capture.CaptureDetails.DpiX, capture.CaptureDetails.DpiY);
 						surface.AddImageContainer((Bitmap)capture.Image, 100, 100);
 					}
+					Activate();
+					WindowDetails.ToForeground(Handle);
 				}
 
 				if (capture!= null) {
diff --git a/Greenshot/Helpers/CaptureHelper.cs b/Greenshot/Helpers/CaptureHelper.cs
index 0f3ac68b2..2edf42134 100644
--- a/Greenshot/Helpers/CaptureHelper.cs
+++ b/Greenshot/Helpers/CaptureHelper.cs
@@ -932,7 +932,6 @@ namespace Greenshot.Helpers {
 				if (windowToCapture != null) {
 					captureForWindow.CaptureDetails.Title = windowToCapture.Text;
 				}
-				((Bitmap)captureForWindow.Image).SetResolution(captureForWindow.CaptureDetails.DpiX, captureForWindow.CaptureDetails.DpiY);
 			}
 
 			return captureForWindow;