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

- Errors from JNetLib now show again

Browse source 
- Shows a dialog with ShowInstDetails hide too


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2586 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-05-27 18:47:18 +00:00
parent 67ee1b23ad
commit f36051ff3c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Contrib/NSISdl/nsisdl.cpp
View file

@ -127,6 +127,8 @@ __declspec(dllexport) void download (HWND parent,
HWND dlg=0;
HWND childwnd=0;
JNL_HTTPGet *get = 0;
char *error=NULL;
static char szDownloading[32];//= "Downloading %s";
@ -222,7 +224,7 @@ __declspec(dllexport) void download (HWND parent,
GetWindowRect(dlg,&cr);
ScreenToClient(dlg,(LPPOINT)&cr);
ScreenToClient(dlg,((LPPOINT)&cr)+1);
GetWindowRect(hwndL,&r);
GetWindowRect(GetDlgItem(childwnd,1016),&r);
ScreenToClient(childwnd,(LPPOINT)&r);
ScreenToClient(childwnd,((LPPOINT)&r)+1);
SetWindowPos(dlg,0,r.left,r.top,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOZORDER);
@ -242,8 +244,6 @@ __declspec(dllexport) void download (HWND parent,
SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0);
}
}
JNL_HTTPGet *get = 0;
{
WSADATA wsaData;
@ -424,8 +424,6 @@ __declspec(dllexport) void download (HWND parent,
}
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0);
}
if (get) delete get;
}
if (g_cancelled) {
@ -437,6 +435,8 @@ __declspec(dllexport) void download (HWND parent,
DeleteFile(filename);
pushstring(error);
}
if (get) delete get;
}