Added tmp-file cleanup, including the cached entry, currently only for Excel.

GreenshotOfficePlugin/Destinations/ExcelDestination.cs

@@ -124,8 +124,8 @@ namespace GreenshotOfficePlugin {
 			exportInformation.ExportMade = true;
 			ProcessExport(exportInformation, surface);
 			// Cleanup imageFile if we created it here, so less tmp-files are generated and left
-			if (createdFile && File.Exists(imageFile)) {
+			if (createdFile) {
-				File.Delete(imageFile);
+				ImageOutput.DeleteNamedTmpFile(imageFile);
 			}
 			return exportInformation;
 		}

GreenshotPlugin/Core/ImageOutput.cs

@@ -541,6 +541,25 @@ namespace GreenshotPlugin.Core {
 			return tmpFile;
 		}
 
+		/// <summary>
+		/// Remove a tmpfile which was created by SaveNamedTmpFile
+		/// Used e.g. by the email export
+		/// </summary>
+		/// <param name="tmpfile"></param>
+		/// <returns>true if it worked</returns>
+		public static bool DeleteNamedTmpFile(string tmpfile) {
+			LOG.Debug("Deleting TMP File: " + tmpfile);
+			try {
+				if (File.Exists(tmpfile)) {
+					File.Delete(tmpfile);
+					tmpFileCache.Remove(tmpfile);
+				}
+				return true;
+			} catch (Exception e) {
+			}
+			return false;
+		}
+
 		/// <summary>
 		/// Helper method to create a temp image file
 		/// </summary>