diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-11-20 00:32:18 +0300 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-11-20 00:32:18 +0300 |
| commit | ecb7dd95e5c9f35ff84d04f7b3a70e1f4f8095e8 (patch) | |
| tree | e383574f41c2c4e88831545a35e480209938a356 | |
| parent | bc9f7f80d07d40eed80e48c7b144e88504eb6525 (diff) | |
Don't swallow scan exceptions
| -rw-r--r-- | Mono.Addins/Mono.Addins.Database/AddinDatabase.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs index 80db3db..5f3a6ff 100644 --- a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs +++ b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs @@ -1169,7 +1169,7 @@ namespace Mono.Addins.Database // If the process has crashed, try to do a new scan, this time using verbose log, // to give the user more information about the origin of the crash. if (pex != null && !retry) { - monitor.ReportError ("Add-in scan operation failed. The Mono runtime may have encountered an error while trying to load an assembly.", null); + monitor.ReportError ("Add-in scan operation failed. The runtime may have encountered an error while trying to load an assembly.", null); if (monitor.LogLevel <= 1) { // Re-scan again using verbose log, to make it easy to find the origin of the error. retry = true; @@ -1179,7 +1179,8 @@ namespace Mono.Addins.Database retry = false; if (!retry) { - monitor.ReportError ("Add-in scan operation failed", (ex is ProcessFailedException ? null : ex)); + var pfex = ex as ProcessFailedException; + monitor.ReportError ("Add-in scan operation failed", pfex != null? pfex.InnerException : ex); monitor.Cancel (); return; } |