fixed #1603: Fix $uploadtime issue, bug fix release

ShareX · Jun 10, 2016 · 0397e0d · 0397e0d
1 parent 1c54b0d
commit 0397e0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ShareX/Properties/AssemblyInfo.cs b/ShareX/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("82E6AC09-0FEF-4390-AD9F-0DD3F5561EFC")]
-[assembly: AssemblyVersion("11.0.0")]
-[assembly: AssemblyFileVersion("11.0.0")]
+[assembly: AssemblyVersion("11.0.1")]
+[assembly: AssemblyFileVersion("11.0.1")]
diff --git a/ShareX/UploadInfoParser.cs b/ShareX/UploadInfoParser.cs
@@ -69,7 +69,10 @@ public string Parse(TaskInfo info, string pattern)
                 pattern = pattern.Replace("$thumbnailfilenamenoext", !string.IsNullOrEmpty(info.ThumbnailFilePath) ? Path.GetFileNameWithoutExtension(info.ThumbnailFilePath) : "");
                 pattern = pattern.Replace("$thumbnailfilename", !string.IsNullOrEmpty(info.ThumbnailFilePath) ? Path.GetFileName(info.ThumbnailFilePath) : "");
 
-                pattern = pattern.Replace("$uploadtime", info.UploadDuration.ElapsedMilliseconds.ToString());
+                if (info.UploadDuration != null)
+                {
+                    pattern = pattern.Replace("$uploadtime", info.UploadDuration.ElapsedMilliseconds.ToString());
+                }
             }
 
             return pattern;