Fix output to source directory not working for batched files.

Author: RandomEngy

VidCoder/ViewModel/Components/OutputPathViewModel.cs

@@ -445,7 +445,7 @@ public string TranslateDvdSourceName(string dvdSourceName)
 			return string.Join(" ", translatedTitleWords);
 		}
 
-		public string BuildOutputPath(string fileName, string extension, string sourcePath)
+		public string GetOutputFolder(string sourcePath)
 		{
 			// Use our default output folder by default
 			string outputFolder = Settings.Default.AutoNameOutputFolder;
@@ -464,6 +464,13 @@ public string BuildOutputPath(string fileName, string extension, string sourcePa
 				}
 			}
 
+			return outputFolder;
+		}
+
+		public string BuildOutputPath(string fileName, string extension, string sourcePath)
+		{
+			string outputFolder = GetOutputFolder(sourcePath);
+
 			if (!string.IsNullOrEmpty(outputFolder))
 			{
 				string result = Path.Combine(outputFolder, fileName + extension);

VidCoder/ViewModel/Components/ProcessingViewModel.cs

@@ -823,13 +823,14 @@ public void QueueMultiple(IEnumerable<string> filesToQueue)
 			foreach (string fileToQueue in filesToQueue)
 			{
 				excludedPaths.Add(fileToQueue);
-				string queueOutputPath = Path.Combine(Settings.Default.AutoNameOutputFolder, Path.GetFileNameWithoutExtension(fileToQueue) + this.outputVM.GetOutputExtensionForCurrentEncodingProfile());
+				string outputFolder = this.outputVM.GetOutputFolder(fileToQueue);
+				string queueOutputPath = Path.Combine(outputFolder, Path.GetFileNameWithoutExtension(fileToQueue) + this.outputVM.GetOutputExtensionForCurrentEncodingProfile());
 				queueOutputPath = this.outputVM.ResolveOutputPathConflicts(queueOutputPath, excludedPaths, isBatch: true);
 
 				// Even if you're doing overwrite don't try to stomp on the source file.
 				if (string.Compare(queueOutputPath, fileToQueue, StringComparison.OrdinalIgnoreCase) == 0)
 				{
-					queueOutputPath = Utilities.CreateUniqueFileName(Path.GetFileNameWithoutExtension(fileToQueue) + this.outputVM.GetOutputExtensionForCurrentEncodingProfile(), Settings.Default.AutoNameOutputFolder, excludedPaths);
+					queueOutputPath = Utilities.CreateUniqueFileName(Path.GetFileNameWithoutExtension(fileToQueue) + this.outputVM.GetOutputExtensionForCurrentEncodingProfile(), outputFolder, excludedPaths);
 				}
 
 				excludedPaths.Add(queueOutputPath);