Fixing an serious flaw with cold FileUpdateTask operation

phillipp · Jul 10, 2012 · 6e9ef31 · 6e9ef31
1 parent 3a905df
commit 6e9ef31
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs b/src/NAppUpdate.Framework/Tasks/FileUpdateTask.cs
@@ -61,6 +61,8 @@ public override bool Prepare(Sources.IUpdateSource source)
                     return false;
             }
 
+			destinationFile = Path.Combine(Path.GetDirectoryName(UpdateManager.Instance.ApplicationPath), LocalPath);
+
 			return tempFile != null;
         }
 
@@ -69,9 +71,9 @@ public override TaskExecutionStatus Execute(bool coldRun)
 			if (string.IsNullOrEmpty(LocalPath))
 				return TaskExecutionStatus.Successful;
 
-			destinationFile = Path.Combine(Path.GetDirectoryName(UpdateManager.Instance.ApplicationPath), LocalPath);
-			if (!Directory.Exists(Path.GetDirectoryName(destinationFile)))
-				Utils.FileSystem.CreateDirectoryStructure(Path.GetDirectoryName(destinationFile), false);
+			var dirName = Path.GetDirectoryName(destinationFile);
+			if (!Directory.Exists(dirName))
+				Utils.FileSystem.CreateDirectoryStructure(dirName, false);
 
 			// Create a backup copy if target exists
 			if (backupFile == null && File.Exists(destinationFile))