diff options
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/thmutil.cpp')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/thmutil.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp index ab1a2233..d3d32176 100644 --- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp | |||
| @@ -5609,8 +5609,8 @@ static HRESULT ShowControl( | |||
| 5609 | // Try to format each control's text based on context, except for editboxes since their text comes from the user. | 5609 | // Try to format each control's text based on context, except for editboxes since their text comes from the user. |
| 5610 | if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type) | 5610 | if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type) |
| 5611 | { | 5611 | { |
| 5612 | LPWSTR wzText = pControl->sczText; | 5612 | LPCWSTR wzText = pControl->sczText; |
| 5613 | LPWSTR wzNote = pControl->sczNote; | 5613 | LPCWSTR wzNote = pControl->sczNote; |
| 5614 | 5614 | ||
| 5615 | if (pTheme->pfnEvaluateCondition) | 5615 | if (pTheme->pfnEvaluateCondition) |
| 5616 | { | 5616 | { |
| @@ -5619,7 +5619,6 @@ static HRESULT ShowControl( | |||
| 5619 | for (DWORD j = 0; j < pControl->cConditionalText; ++j) | 5619 | for (DWORD j = 0; j < pControl->cConditionalText; ++j) |
| 5620 | { | 5620 | { |
| 5621 | THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j; | 5621 | THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j; |
| 5622 | wzText = pConditionalText->sczText; | ||
| 5623 | 5622 | ||
| 5624 | if (pConditionalText->sczCondition) | 5623 | if (pConditionalText->sczCondition) |
| 5625 | { | 5624 | { |
| @@ -5641,7 +5640,6 @@ static HRESULT ShowControl( | |||
| 5641 | for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j) | 5640 | for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j) |
| 5642 | { | 5641 | { |
| 5643 | THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j; | 5642 | THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j; |
| 5644 | wzNote = pConditionalNote->sczText; | ||
| 5645 | 5643 | ||
| 5646 | if (pConditionalNote->sczCondition) | 5644 | if (pConditionalNote->sczCondition) |
| 5647 | { | 5645 | { |
