Bug 368544 - don't try to send with empty URL, r=luser

This commit is contained in:
wr%rosenauer.org 2007-07-25 01:06:22 +00:00
Родитель 91b8a4cf2f
Коммит 190f1add0e
1 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -132,8 +132,6 @@ bool ReadConfig()
wcscpy(s, L".ini"); wcscpy(s, L".ini");
GetPrivateProfileString(L"Settings", L"URL", L"", sendURL, 2048, fileName); GetPrivateProfileString(L"Settings", L"URL", L"", sendURL, 2048, fileName);
if (sendURL[0] == '\0')
return false;
TCHAR tmp[16]; TCHAR tmp[16];
GetPrivateProfileString(L"Settings", L"Delete", L"1", tmp, 16, fileName); GetPrivateProfileString(L"Settings", L"Delete", L"1", tmp, 16, fileName);
@ -325,14 +323,20 @@ bool SendCrashReport(HINSTANCE hInstance, LPCTSTR dumpFile)
DWORD WINAPI SendThreadProc(LPVOID param) DWORD WINAPI SendThreadProc(LPVOID param)
{ {
bool finishedOk;
SENDTHREADDATA* td = (SENDTHREADDATA*)param; SENDTHREADDATA* td = (SENDTHREADDATA*)param;
//XXX: send some extra params? //XXX: send some extra params?
map<wstring, wstring> params; map<wstring, wstring> params;
wstring url(sendURL); wstring url(sendURL);
bool finishedOk = google_airbag::CrashReportSender if (url.empty()) {
::SendCrashReport(url, finishedOk = false;
params, }
wstring(td->dumpFile)); else {
finishedOk = google_airbag::CrashReportSender
::SendCrashReport(url,
params,
wstring(td->dumpFile));
}
PostMessage(td->hDlg, WM_UPLOADCOMPLETE, finishedOk ? 1 : 0, 0); PostMessage(td->hDlg, WM_UPLOADCOMPLETE, finishedOk ? 1 : 0, 0);
delete td; delete td;
return 0; return 0;