From 198242916b6154a6948b8ce959ceca6846135dd3 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 4 Oct 2014 11:48:38 +0000
Subject: WinGui: Fix an issue with Audio Track Names and ,

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6431 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../Utilities/QueryGeneratorUtility.cs                              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'win')

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 513f1b358..2f6c4fa4e 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -711,13 +711,15 @@ namespace HandBrake.ApplicationServices.Utilities
                     foundTrackName = true;
                 }
 
+                string fixedTrackName = trackName != null ? trackName.Replace(",", "\\,") : string.Empty;
+
                 if (firstLoop)
                 {
-                    audioItems = string.IsNullOrEmpty(trackName) ? "\\\"\\\"" : string.Format("\\\"{0}\\\"", trackName.Trim());
+                    audioItems = string.IsNullOrEmpty(fixedTrackName) ? "\\\"\\\"" : string.Format("\\\"{0}\\\"", fixedTrackName.Trim());
                     firstLoop = false;
                 }
                 else
-                    audioItems += "," + (string.IsNullOrEmpty(trackName) ? "\\\"\\\"" : string.Format("\\\"{0}\\\"", trackName.Trim()));
+                    audioItems += "," + (string.IsNullOrEmpty(fixedTrackName) ? "\\\"\\\"" : string.Format("\\\"{0}\\\"", fixedTrackName.Trim()));
             }
             if (foundTrackName)
                 query += string.Format(" --aname={0}", audioItems);
-- 
cgit v1.2.3