Using ChangeUI twice, where the first UI has a branding image and the second doesn't, still made SetBrandingImage think there is really a branding image. Fixed.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1591 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c0333978c2
commit
a15d628f48
1 changed files with 2 additions and 3 deletions
|
@ -1259,9 +1259,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
||||||
SEARCH(IDCANCEL);
|
SEARCH(IDCANCEL);
|
||||||
|
|
||||||
// Search for bitmap holder (default for SetBrandingImage)
|
// Search for bitmap holder (default for SetBrandingImage)
|
||||||
|
branding_image_found = false;
|
||||||
DialogItemTemplate* dlgItem = 0;
|
DialogItemTemplate* dlgItem = 0;
|
||||||
int i = 0;
|
for (int i = 0; dlgItem = UIDlg.GetItemByIdx(i); i++) {
|
||||||
while (dlgItem = UIDlg.GetItemByIdx(i)) {
|
|
||||||
if (IS_INTRESOURCE(dlgItem->szClass)) {
|
if (IS_INTRESOURCE(dlgItem->szClass)) {
|
||||||
if (dlgItem->szClass == MAKEINTRESOURCE(0x0082)) {
|
if (dlgItem->szClass == MAKEINTRESOURCE(0x0082)) {
|
||||||
if ((dlgItem->dwStyle & SS_BITMAP) == SS_BITMAP) {
|
if ((dlgItem->dwStyle & SS_BITMAP) == SS_BITMAP) {
|
||||||
|
@ -1271,7 +1271,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SAVE(IDD_INST);
|
SAVE(IDD_INST);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue