* 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

@ -63,11 +63,10 @@ end;
function mynsiscallback(const NSPIM: TNSPIM): Pointer; cdecl;
begin
Result := 0;
Result := nil;
if NSPIM = NSPIM_UNLOAD then
begin
// Note: Cannot use NSISDialog here because g_hwndParent has been destroyed at this point
MessageBox(0, PChar('NSPIM_UNLOAD is the final callback, goodbye...'), PChar('mynsiscallback'), MB_OK);
NSISDialog(PChar('NSPIM_UNLOAD is the final callback, goodbye...'), PChar('mynsiscallback'), MB_OK);
end;
end;