WinGui:

- Multiple instance support. 
  Each instance has a unique id. id = 0 will use the standard log/queue files.  
  id = 1,2...n will use standard file names but with the instance id added to the end.
  This means that each instance will have it's own queue. Queue is not shared between Instances
  If multiple queue files are found when starting up, it will offer to load them all in.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3440 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 3 insertions, 3 deletions

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
index 6aefa03fd..039cb3f3d 100644
--- a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
@@ -154,7 +154,7 @@ namespace HandBrake.ApplicationServices.Services
                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");

                 string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +

                                 "\\HandBrake\\logs";

-                string dvdInfoPath = Path.Combine(logDir, "last_scan_log.txt");

+                string dvdInfoPath = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId));

 

                 // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file)

                 if (File.Exists(dvdInfoPath))

@@ -218,8 +218,8 @@ namespace HandBrake.ApplicationServices.Services
                 // we'll need to make a copy of it.

                 string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +

                                 "\\HandBrake\\logs";

-                string logFile = Path.Combine(logDir, "last_scan_log.txt");

-                string logFile2 = Path.Combine(logDir, "tmp_appReadable_log.txt");

+                string logFile = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId));

+                string logFile2 = Path.Combine(logDir, string.Format("tmp_appReadable_log{0}.txt", Init.InstanceId));

 

                 try

                 {