From fced4164a72e8997cbd579b7b6c67c424b62a9e1 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Fri, 7 Feb 2014 17:51:05 +0100
Subject: [PATCH] Changes for feature 683

---
 GreenshotConfluencePlugin/ConfluenceDestination.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/GreenshotConfluencePlugin/ConfluenceDestination.cs b/GreenshotConfluencePlugin/ConfluenceDestination.cs
index 315edf19d..f8fffbf0f 100644
--- a/GreenshotConfluencePlugin/ConfluenceDestination.cs
+++ b/GreenshotConfluencePlugin/ConfluenceDestination.cs
@@ -37,7 +37,8 @@ namespace GreenshotConfluencePlugin {
 	/// </summary>
 	public class ConfluenceDestination : AbstractDestination {
 		private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceDestination));
-		private static ConfluenceConfiguration config = IniConfig.GetIniSection<ConfluenceConfiguration>();
+		private static readonly ConfluenceConfiguration config = IniConfig.GetIniSection<ConfluenceConfiguration>();
+		private static readonly CoreConfiguration coreConfig = IniConfig.GetIniSection<CoreConfiguration>();
 		private static Image confluenceIcon = null;
 		private Confluence.Page page;
 		public static bool IsInitialized {
@@ -122,7 +123,7 @@ namespace GreenshotConfluencePlugin {
 
 			Page selectedPage = page;
 			bool openPage = (page == null) && config.OpenPageAfterUpload;
-			string filename = FilenameHelper.GetFilename(config.UploadFormat, captureDetails);
+			string filename = FilenameHelper.GetFilenameWithoutExtensionFromPattern(coreConfig.OutputFileFilenamePattern, captureDetails);
 			if (selectedPage == null) {
 				ConfluenceUpload confluenceUpload = new ConfluenceUpload(filename);
 				Nullable<bool> dialogResult = confluenceUpload.ShowDialog();
@@ -134,6 +135,10 @@ namespace GreenshotConfluencePlugin {
 					filename = confluenceUpload.Filename;
 				}
 			}
+			string extension = "." + config.UploadFormat;
+			if (!filename.ToLower().EndsWith(extension)) {
+				filename = filename + extension;
+			}
 			if (selectedPage != null) {
 				string errorMessage;
 				bool uploaded = upload(surface, selectedPage, filename, out errorMessage);