diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-21 13:15:58 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-21 13:19:14 +1000 |
commit | c903a96bd8d61a375448e1a6ad7b40bab8cb24c4 (patch) | |
tree | f001fbcc515be9f5940936deca0b115fd5118299 | |
parent | 50cb451bcee148afd9768086c1bb5ed4f75562df (diff) | |
download | wix-c903a96bd8d61a375448e1a6ad7b40bab8cb24c4.tar.gz wix-c903a96bd8d61a375448e1a6ad7b40bab8cb24c4.tar.bz2 wix-c903a96bd8d61a375448e1a6ad7b40bab8cb24c4.zip |
WIXBUG:3869 FilterResult needs to apply MB_TYPEMASK to dwAllowedResults.
-rw-r--r-- | src/engine/userexperience.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp index dd59a431..6b0e3bf5 100644 --- a/src/engine/userexperience.cpp +++ b/src/engine/userexperience.cpp | |||
@@ -1973,12 +1973,13 @@ static int FilterResult( | |||
1973 | __in int nResult | 1973 | __in int nResult |
1974 | ) | 1974 | ) |
1975 | { | 1975 | { |
1976 | DWORD dwFilteredAllowedResults = dwAllowedResults & MB_TYPEMASK; | ||
1976 | if (IDNOACTION == nResult || IDERROR == nResult) // do nothing and errors pass through. | 1977 | if (IDNOACTION == nResult || IDERROR == nResult) // do nothing and errors pass through. |
1977 | { | 1978 | { |
1978 | } | 1979 | } |
1979 | else | 1980 | else |
1980 | { | 1981 | { |
1981 | switch (dwAllowedResults) | 1982 | switch (dwFilteredAllowedResults) |
1982 | { | 1983 | { |
1983 | case MB_OK: | 1984 | case MB_OK: |
1984 | nResult = IDOK; | 1985 | nResult = IDOK; |