* mynsiscallback must return nil and not 0 to avoid warning in some versions of Delphi.

* NSISDialog only uses g_hwndParent if it is valid.


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6576 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-02-06 21:22:31 +00:00
parent b28ce8b1d8
commit 4cdb1cf7d1
3 changed files with 13 additions and 4 deletions

View file

@ -195,8 +195,12 @@ begin
end;
procedure NSISDialog(const text, caption: string; const buttons: integer);
var
hwndOwner: HWND;
begin
MessageBox(g_hwndParent, PChar(text), PChar(caption), buttons);
hwndOwner := g_hwndParent;
if not IsWindow(g_hwndParent) then hwndOwner := 0; // g_hwndParent is not valid in NSPIM_[GUI]UNLOAD
MessageBox(hwndOwner, PChar(text), PChar(caption), buttons);
end;
begin