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/GeometryCache.cpp (1 of 4 files). Show all

Unified · Split

interface/src/renderer/GeometryCache.cpp+7−1
@@ -250,7 +250,10 @@ QSharedPointer<NetworkGeometry> GeometryCache::getGeometry(const QUrl& url) { · 249 unmodified lines
250 return geometry;250 return geometry;
251}251}
252 252
253NetworkGeometry::NetworkGeometry(const QUrl& url) {253NetworkGeometry::NetworkGeometry(const QUrl& url) : _reply(NULL) {
254 if (!url.isValid()) {
255 return;
256 }
254 QNetworkRequest request(url);257 QNetworkRequest request(url);
255 request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);258 request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
256 _reply = Application::getInstance()->getNetworkAccessManager()->get(request);259 _reply = Application::getInstance()->getNetworkAccessManager()->get(request);
@@ -260,6 +263,9 @@ NetworkGeometry::NetworkGeometry(const QUrl& url) { · 3 unmodified lines
260}263}
261 264
262NetworkGeometry::~NetworkGeometry() {265NetworkGeometry::~NetworkGeometry() {
266 if (_reply != NULL) {
267 delete _reply;
268 }
263 foreach (const NetworkMesh& mesh, _meshes) {269 foreach (const NetworkMesh& mesh, _meshes) {
264 glDeleteBuffers(1, &mesh.indexBufferID);270 glDeleteBuffers(1, &mesh.indexBufferID);
265 glDeleteBuffers(1, &mesh.vertexBufferID);271 glDeleteBuffers(1, &mesh.vertexBufferID);

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