Reverting 3452

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

1 files changed, 8 insertions, 4 deletions

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index ca3f898df..87b0e0027 100644
--- a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
@@ -15,6 +15,7 @@ namespace HandBrake.ApplicationServices.Services
     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.ApplicationServices.Properties;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     /// <summary>

@@ -251,15 +252,14 @@ namespace HandBrake.ApplicationServices.Services
             SendKeys.Send("^C");

             SendKeys.Flush();

 

-            /*//if (HbProcess != null)

+            //if (HbProcess != null)

             //{

             //    HbProcess.StandardInput.AutoFlush = true;

             //    HbProcess.StandardInput.WriteLine("^c^z");

-            //}*/

+            //}

         }

 

         /* Helpers */

-

         /// <summary>

         /// Save a copy of the log to the users desired location or a default location

         /// if this feature is enabled in options.

@@ -315,6 +315,8 @@ namespace HandBrake.ApplicationServices.Services
         {

             IsEncoding = false;

 

+            //   ReadFile(null);

+

             if (this.EncodeEnded != null)

                 this.EncodeEnded(this, new EventArgs());

 

@@ -342,6 +344,9 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>

         /// Read the log file

         /// </summary>

+        /// <param name="n">

+        /// The object.

+        /// </param>

         private void ReadFile()

         {

             logBuffer = new StringBuilder();

@@ -393,7 +398,6 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>

         /// Setup the logging.

         /// </summary>

-        /// <param name="encodeJob">The Encode Job Object</param>

         private void SetupLogging(Job encodeJob)

         {

             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";