From 7d267bb709a34d1159e4a2509734bef5d4dcc892 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 9 Mar 2018 15:19:48 -0800 Subject: [PATCH] Fix local KTX files never being removed from pending downloads --- .../model-networking/src/model-networking/TextureCache.cpp | 7 +++++++ .../model-networking/src/model-networking/TextureCache.h | 1 + 2 files changed, 8 insertions(+) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index ffc9af5264..034f31b707 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -459,6 +459,10 @@ void NetworkTexture::makeRequest() { } +void NetworkTexture::handleLocalRequestCompleted() { + TextureCache::requestCompleted(_self); +} + void NetworkTexture::makeLocalRequest() { const QString scheme = _url.scheme(); QString path; @@ -468,6 +472,9 @@ void NetworkTexture::makeLocalRequest() { path = ":" + _url.path(); } + auto self = _self; + connect(this, &Resource::finished, this, &NetworkTexture::handleLocalRequestCompleted); + path = FileUtils::selectFile(path); auto storage = std::make_shared(path); diff --git a/libraries/model-networking/src/model-networking/TextureCache.h b/libraries/model-networking/src/model-networking/TextureCache.h index 080c2704c6..b2740e2ca1 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.h +++ b/libraries/model-networking/src/model-networking/TextureCache.h @@ -71,6 +71,7 @@ public slots: protected: void makeRequest() override; void makeLocalRequest(); + Q_INVOKABLE void handleLocalRequestCompleted(); virtual bool isCacheable() const override { return _loaded; }