diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-02-16 18:43:53 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-02-16 19:34:29 -0500 |
| commit | a8a0dde828c474067cb92fd9cfec85372ab4160e (patch) | |
| tree | bc2840674e1079a042affe6c625ea7d6c480bb1c | |
| parent | 9b2edf15154381f76360d91da31bad6978ffaa1c (diff) | |
| download | wix-a8a0dde828c474067cb92fd9cfec85372ab4160e.tar.gz wix-a8a0dde828c474067cb92fd9cfec85372ab4160e.tar.bz2 wix-a8a0dde828c474067cb92fd9cfec85372ab4160e.zip | |
Handle WixException with null message.
| -rw-r--r-- | src/wix/wix/Program.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/wix/wix/Program.cs b/src/wix/wix/Program.cs index d1818df0..e4ee7ba1 100644 --- a/src/wix/wix/Program.cs +++ b/src/wix/wix/Program.cs | |||
| @@ -54,9 +54,18 @@ namespace WixToolset.Tools | |||
| 54 | } | 54 | } |
| 55 | catch (WixException e) | 55 | catch (WixException e) |
| 56 | { | 56 | { |
| 57 | listener.Write(e.Error); | 57 | if (e.Error != null) |
| 58 | { | ||
| 59 | listener.Write(e.Error); | ||
| 58 | 60 | ||
| 59 | return e.Error.Id; | 61 | return e.Error.Id; |
| 62 | } | ||
| 63 | else | ||
| 64 | { | ||
| 65 | listener.Write(e.Message); | ||
| 66 | |||
| 67 | return e.HResult; | ||
| 68 | } | ||
| 60 | } | 69 | } |
| 61 | catch (Exception e) | 70 | catch (Exception e) |
| 62 | { | 71 | { |