dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Calling show after a failed initDialog caused a freeze.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3488 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anoncvs_ezcontents 2004-02-10 23:29:49 +00:00
parent 4bd2132d6a
commit 2fed742279
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -1306,7 +1306,7 @@ void WINAPI showCfgDlg()
int i = nNumFields; int i = nNumFields;
while (i--) { while (i--) {
FieldType *pField = pFields + i; FieldType *pField = pFields + i;
int j = FIELD_BUFFERS; int j = FIELD_BUFFERS;
while (j--) while (j--)
FREE(((char **) pField)[j]); FREE(((char **) pField)[j]);
@ -1334,9 +1334,8 @@ extern "C" void __declspec(dllexport) dialog(HWND hwndParent, int string_size,
pushstring("error"); pushstring("error");
return; return;
} }
if (createCfgDlg()) { if (createCfgDlg())
return; return;
}
popstring(NULL); popstring(NULL);
showCfgDlg(); showCfgDlg();
} }
@ -1350,8 +1349,9 @@ extern "C" void __declspec(dllexport) initDialog(HWND hwndParent, int string_siz
pushstring("error"); pushstring("error");
return; return;
} }
if (createCfgDlg())
return;
initCalled++; initCalled++;
createCfgDlg();
} }
extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size, extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size,

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.