Bug 1138807 - Treat user cancelling of HTTPHandlerPane as Success. r=jimm

This commit is contained in:
Hector Zhao 2015-03-03 12:55:50 +08:00
parent 9b1bec56da
commit ad746928dd

View File

@ -620,9 +620,13 @@ DynSHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo)
return NS_ERROR_FAILURE;
}
nsresult rv =
SUCCEEDED(SHOpenWithDialogFn(hwndParent, poainfo)) ? NS_OK :
NS_ERROR_FAILURE;
nsresult rv;
HRESULT hr = SHOpenWithDialogFn(hwndParent, poainfo);
if (SUCCEEDED(hr) || (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED))) {
rv = NS_OK;
} else {
rv = NS_ERROR_FAILURE;
}
FreeLibrary(shellDLL);
return rv;
}