From 9e0a754032d4d5ea8b647205691f5d5eb22b1d85 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Sun, 17 Jul 2011 14:47:31 +0000
Subject: [PATCH] Merge from 0.8: Fixed open recent (tray-icon context menu)
 and added the "save" icon to the SaveAs in the editor menu

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1288 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/Forms/ImageEditorForm.Designer.cs | 1 +
 Greenshot/Forms/MainForm.cs                 | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs
index 8cfccac96..d9d546ba3 100644
--- a/Greenshot/Forms/ImageEditorForm.Designer.cs
+++ b/Greenshot/Forms/ImageEditorForm.Designer.cs
@@ -427,6 +427,7 @@ namespace Greenshot {
 			// 
 			// saveAsToolStripMenuItem
 			// 
+			this.saveAsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
 			this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
 			this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
 									| System.Windows.Forms.Keys.S)));
diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs
index 217ef1dcf..150598978 100644
--- a/Greenshot/Forms/MainForm.cs
+++ b/Greenshot/Forms/MainForm.cs
@@ -780,8 +780,9 @@ namespace Greenshot {
 		private void Contextmenu_OpenRecent(object sender, EventArgs eventArgs) {
 			string path;
 			string configPath = FilenameHelper.FillVariables(conf.OutputFilePath);
-			if (File.Exists(conf.OutputFileAsFullpath)) {
-				path = conf.OutputFileAsFullpath;
+			string lastFilePath = Path.GetDirectoryName(conf.OutputFileAsFullpath);
+			if (Directory.Exists(lastFilePath)) {
+				path = lastFilePath;
 			} else if (Directory.Exists(configPath)) {
 				path = configPath;
 			} else {