equal
deleted
inserted
replaced
271 pendingNotifications.clear(); |
271 pendingNotifications.clear(); |
272 |
272 |
273 if (state != Working) |
273 if (state != Working) |
274 return; |
274 return; |
275 |
275 |
276 while (!current.isEmpty()) { |
276 while (state == Working && !current.isEmpty()) { |
277 InternalNotifications notification = current.dequeue(); |
277 InternalNotifications notification = current.dequeue(); |
278 switch (notification) { |
278 switch (notification) { |
279 case NotifyDownstreamReadyWrite: |
279 case NotifyDownstreamReadyWrite: |
280 if (copyDevice) |
280 if (copyDevice) |
281 _q_copyReadyRead(); |
281 _q_copyReadyRead(); |
578 } |
578 } |
579 |
579 |
580 void QNetworkReplyImpl::abort() |
580 void QNetworkReplyImpl::abort() |
581 { |
581 { |
582 Q_D(QNetworkReplyImpl); |
582 Q_D(QNetworkReplyImpl); |
583 if (d->state == QNetworkReplyImplPrivate::Aborted) |
583 if (d->state == QNetworkReplyImplPrivate::Finished || d->state == QNetworkReplyImplPrivate::Aborted) |
584 return; |
584 return; |
585 |
585 |
586 // stop both upload and download |
586 // stop both upload and download |
587 if (d->outgoingData) |
587 if (d->outgoingData) |
588 disconnect(d->outgoingData, 0, this, 0); |
588 disconnect(d->outgoingData, 0, this, 0); |