hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #301 from timonwong/master

Browse source 
Fix crashes due to deletion resources owned by QNetworkAccessManager
This commit is contained in:
chulai 2013-05-08 17:44:25 -07:00
parent 7555f89fad 8a46cd843c
commit 986a3e027a
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webmultimediadownload.cc
View file

@ -14,19 +14,19 @@ WebMultimediaDownload::WebMultimediaDownload( QUrl const & url,
void WebMultimediaDownload::cancel() void WebMultimediaDownload::cancel()
{ {
reply.reset(); reply = NULL;
finish(); finish();
} }
void WebMultimediaDownload::replyFinished( QNetworkReply * r ) void WebMultimediaDownload::replyFinished( QNetworkReply * r )
{ {
if ( r != reply.get() ) if ( !r || r != reply )
return; // Not our reply return; // Not our reply
if ( reply->error() == QNetworkReply::NoError ) if ( r->error() == QNetworkReply::NoError )
{ {
QByteArray all = reply->readAll(); QByteArray all = r->readAll();
Mutex::Lock _( dataMutex ); Mutex::Lock _( dataMutex );
@ -37,11 +37,12 @@ void WebMultimediaDownload::replyFinished( QNetworkReply * r )
hasAnyData = true; hasAnyData = true;
} }
else else
setErrorString( reply->errorString() ); setErrorString( r->errorString() );
r->deleteLater();
reply = NULL;
finish(); finish();
reply.reset();
} }
bool WebMultimediaDownload::isAudioUrl( QUrl const & url ) bool WebMultimediaDownload::isAudioUrl( QUrl const & url )

2
webmultimediadownload.hh
View file

@ -12,7 +12,7 @@ class WebMultimediaDownload: public DataRequest
{ {
Q_OBJECT Q_OBJECT
sptr< QNetworkReply > reply; QNetworkReply * reply;
public: public: