Merge branch 'master' of https://github.com/dlwyatt/PowerShellLoggingModule

dlwyatt · dlwyatt · commit cd8d66c81cb0 · 2014-05-07T00:33:39.000-04:00
Conflicts:
	LogFile.cs
diff --git a/LogFile.cs b/LogFile.cs
@@ -202,20 +202,23 @@ private void ReportError(Exception e)
             {
                 return;
             }
-
+            
             // ReSharper disable once EmptyGeneralCatchClause
             try
             {
                 HostIOInterceptor.Instance.Paused = true;
                 ErrorCallback.Invoke(this, e);
-                HostIOInterceptor.Instance.Paused = false;
             }
             catch { }
+            finally
+            {
+                HostIOInterceptor.Instance.Paused = false;
+            }
         }
 
         #endregion
     }
 }
 
 // ReSharper restore MemberCanBePrivate.Global
-// ReSharper restore UnusedMember.Global
+// ReSharper restore UnusedMember.Global

Original file line number	Diff line number	Diff line change
`@@ -202,20 +202,23 @@ private void ReportError(Exception e)`
`202`	`202`	`{`
`203`	`203`	`return;`
`204`	`204`	`}`
`205`		`-`
	`205`	`+`
`206`	`206`	`// ReSharper disable once EmptyGeneralCatchClause`
`207`	`207`	`try`
`208`	`208`	`{`
`209`	`209`	`HostIOInterceptor.Instance.Paused = true;`
`210`	`210`	`ErrorCallback.Invoke(this, e);`
`211`		`- HostIOInterceptor.Instance.Paused = false;`
`212`	`211`	`}`
`213`	`212`	`catch { }`
	`213`	`+ finally`
	`214`	`+ {`
	`215`	`+ HostIOInterceptor.Instance.Paused = false;`
	`216`	`+ }`
`214`	`217`	`}`
`215`	`218`
`216`	`219`	`#endregion`
`217`	`220`	`}`
`218`	`221`	`}`
`219`	`222`
`220`	`223`	`// ReSharper restore MemberCanBePrivate.Global`
`221`		`-// ReSharper restore UnusedMember.Global`
	`224`	`+// ReSharper restore UnusedMember.Global`