From d4e9b701615cf714980cc56bf495ca4d43e1f6f2 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Tue, 31 Jan 2012 16:18:44 +0000
Subject: [PATCH] Fixing a cleanup / reentrant problem by closing the current
 CaptureForm if a new is opened and disposing the capture before exiting
 MakeCapture().

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1614 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/Forms/CaptureForm.cs     | 15 +++++++++++++++
 Greenshot/Helpers/CaptureHelper.cs |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/Greenshot/Forms/CaptureForm.cs b/Greenshot/Forms/CaptureForm.cs
index 2d064850b..815543115 100644
--- a/Greenshot/Forms/CaptureForm.cs
+++ b/Greenshot/Forms/CaptureForm.cs
@@ -47,6 +47,7 @@ namespace Greenshot.Forms {
 		private static Brush GreenOverlayBrush = new SolidBrush(Color.FromArgb(50, Color.MediumSeaGreen));
 		private static Brush RedOverlayBrush = new SolidBrush(Color.FromArgb(50, Color.DarkRed));
 		private static Pen OverlayPen = new Pen(Color.FromArgb(50, Color.Black));
+		private static CaptureForm currentForm = null;
 
 		private int mX;
 		private int mY;
@@ -81,6 +82,20 @@ namespace Greenshot.Forms {
 		}
 
 		public CaptureForm(ICapture capture, List<WindowDetails> windows) {
+			if (currentForm != null) {
+				LOG.Debug("Found currentForm, Closing already opened CaptureForm");
+				currentForm.Close();
+				currentForm = null;
+				Application.DoEvents();
+			}
+			currentForm = this;
+
+			// clean up
+			this.FormClosed += delegate {
+				currentForm = null;
+				LOG.Debug("Remove CaptureForm from currentForm");
+			};
+
 			this.capture = capture;
 			this.windows = windows;
 			captureMode = capture.CaptureDetails.CaptureMode;
diff --git a/Greenshot/Helpers/CaptureHelper.cs b/Greenshot/Helpers/CaptureHelper.cs
index 32b5b1446..768e7329c 100644
--- a/Greenshot/Helpers/CaptureHelper.cs
+++ b/Greenshot/Helpers/CaptureHelper.cs
@@ -297,6 +297,11 @@ namespace Greenshot.Helpers {
 					LOG.Warn("Unknown capture mode: " + captureMode);
 					break;
 			}
+
+			if (capture != null) {
+				LOG.Debug("Disposing capture");
+				capture.Dispose();
+			}
 		}
 				
 		/// <summary>