summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-10-08 20:02:41 +0000
committersr55 <[email protected]>2013-10-08 20:02:41 +0000
commitb1fc28838bdb40a9a7c8c77b960cc2c82262b1e8 (patch)
treeaab769eaefe614b62938a77b1b000c2a7efa1de3 /win/CS/HandBrake.ApplicationServices
parentb2d1486ba0c2bd29e88e9ed8358cadd447c5cbee (diff)
WinGui: Handle libhb dll errors.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5825 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
-rw-r--r--win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj1
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/LibScan.cs11
2 files changed, 10 insertions, 2 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index bbfed6f4e..473ae6893 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -167,6 +167,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
index 0c0a32b9f..fb6963be8 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
@@ -101,8 +101,15 @@ namespace HandBrake.ApplicationServices.Services
header = GeneralUtilities.CreateCliLogHeader();
this.userSettingService = userSettingService;
- HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
- HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
+ try
+ {
+ HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
+ HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
+ }
+ catch (Exception exc)
+ {
+ // Do nothing.
+ }
}
#region Events