summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2017-05-02 20:37:20 +0100
committersr55 <[email protected]>2017-05-02 20:37:20 +0100
commitec57a237454d198768b82985a7daa06d9c4abd17 (patch)
tree4c77e058a8d5cca733078ee383c7598bdd51889b
parente1bcb7af6947aed329924a82e58a45c143feedbf (diff)
WinGui: Fix an issue with long chapters causing scans to fail to complete. Fixes #713
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs5
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 2c56a76c4..854dc4cbe 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -14,6 +14,7 @@ namespace HandBrake.ApplicationServices.Interop
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
+ using System.IO;
using System.Linq;
using System.Runtime.ExceptionServices;
using System.Runtime.InteropServices;
@@ -240,6 +241,7 @@ namespace HandBrake.ApplicationServices.Interop
catch (Exception exc)
{
Debug.WriteLine(exc);
+ this.log.LogMessage(exc.ToString(), LogMessageType.API, LogLevel.Error);
}
};
this.scanPollTimer.Start();
@@ -504,12 +506,11 @@ namespace HandBrake.ApplicationServices.Interop
}
else if (state != null && state.State == NativeConstants.HB_STATE_SCANDONE)
{
- this.log.LogMessage("Scan: HB_STATE_SCANDONE", LogMessageType.API, LogLevel.Info);
this.scanPollTimer.Stop();
var jsonMsg = HBFunctions.hb_get_title_set_json(this.hbHandle);
string scanJson = InteropUtilities.ToStringFromUtf8Ptr(jsonMsg);
- this.log.LogMessage(scanJson, LogMessageType.Progress, LogLevel.Info);
+ this.log.LogMessage(scanJson, LogMessageType.Progress, LogLevel.Trace);
if (string.IsNullOrEmpty(scanJson))
{
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs
index 4eea32e12..6ae496901 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs
@@ -32,6 +32,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// Gets or sets the ticks.
/// </summary>
- public int Ticks { get; set; }
+ public long Ticks { get; set; }
}
} \ No newline at end of file