WinGui:

- Unsubscribe an event handler when cancelling the scan.

git-svn-id: svn://localhost/HandBrake/trunk@3632 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
index c18fad3..e2412cb 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
@@ -138,6 +138,8 @@ namespace HandBrake.ApplicationServices.Services
         {\r
             try\r
             {\r
+                this.readData.OnScanProgress -= this.OnScanProgress;\r
+\r
                 if (hbProc != null && !hbProc.HasExited)\r
                     hbProc.Kill();\r
             }\r
@@ -201,7 +203,7 @@ namespace HandBrake.ApplicationServices.Services
                 this.hbProc.Start();\r
 \r
                 this.readData = new Parser(this.hbProc.StandardError.BaseStream);\r
-                this.readData.OnScanProgress += new ScanProgressEventHandler(this.OnScanProgress);\r
+                this.readData.OnScanProgress += this.OnScanProgress;\r
                 this.SouceData = DVD.Parse(this.readData);\r
 \r
                 // Write the Buffer out to file.\r

diff --git a/win/C#/HandBrake10.5.1.ReSharper b/win/C#/HandBrake10.5.1.ReSharper
index 42cfee8..781e47d 100644 (file)
--- a/win/C#/HandBrake10.5.1.ReSharper
+++ b/win/C#/HandBrake10.5.1.ReSharper
@@ -86,6 +86,7 @@
         <Abbreviation Text="UTF" />\r
         <Abbreviation Text="TX" />\r
         <Abbreviation Text="SRT" />\r
+        <Abbreviation Text="CLI" />\r
       </Naming2>\r
       <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
 <Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">\r