| Index: plugin/npapi_host_control/win/stream_operation.cc
|
| ===================================================================
|
| --- plugin/npapi_host_control/win/stream_operation.cc (revision 20337)
|
| +++ plugin/npapi_host_control/win/stream_operation.cc (working copy)
|
| @@ -267,6 +267,11 @@
|
| ULONG ulProgressMax,
|
| ULONG ulStatusCode,
|
| LPCWSTR szStatusText) {
|
| + if (cancel_requested_) {
|
| + binding_->Abort();
|
| + return S_OK;
|
| + }
|
| +
|
| // Capture URL re-directs and MIME-type status notifications.
|
| switch (ulStatusCode) {
|
| case BINDSTATUS_BEGINDOWNLOADDATA:
|
| @@ -366,6 +371,7 @@
|
|
|
| // Don't bother processing any data if the stream has been canceled.
|
| if (cancel_requested_) {
|
| + binding_->Abort();
|
| return S_OK;
|
| }
|
|
|
| @@ -749,8 +755,5 @@
|
| ATLASSERT(binding_ &&
|
| "Cancellation request on a stream that has not been bound.");
|
| cancel_requested_ = true;
|
| - if (binding_) {
|
| - return binding_->Abort();
|
| - }
|
| return S_OK;
|
| }
|
|
|