History

Avoid warnings on invalid URLs, delete reply when reference is deleted.

Andrzej Kapolka committed 13 years ago

Commit 97cbef11 parent 40a32684 files · +19 −3Browse files

Showing the changes to interface/src/renderer/TextureCache.cpp (1 of 4 files). Show all

Unified · Split

interface/src/renderer/TextureCache.cpp+10−1
@@ -173,7 +173,10 @@ Texture::~Texture() { · 172 unmodified lines
173 glDeleteTextures(1, &_id);173 glDeleteTextures(1, &_id);
174}174}
175 175
176NetworkTexture::NetworkTexture(const QUrl& url) {176NetworkTexture::NetworkTexture(const QUrl& url) : _reply(NULL) {
177 if (!url.isValid()) {
178 return;
179 }
177 QNetworkRequest request(url);180 QNetworkRequest request(url);
178 request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);181 request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
179 _reply = Application::getInstance()->getNetworkAccessManager()->get(request);182 _reply = Application::getInstance()->getNetworkAccessManager()->get(request);
@@ -182,6 +185,12 @@ NetworkTexture::NetworkTexture(const QUrl& url) { · 2 unmodified lines
182 connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));185 connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(handleReplyError()));
183}186}
184 187
188NetworkTexture::~NetworkTexture() {
189 if (_reply != NULL) {
190 delete _reply;
191 }
192}
193
185void NetworkTexture::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {194void NetworkTexture::handleDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
186 if (bytesReceived < bytesTotal && !_reply->isFinished()) {195 if (bytesReceived < bytesTotal && !_reply->isFinished()) {
187 return;196 return;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t