Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12615 from jherico/fix/ktx_loading

Browse source 
Fix local KTX files never being removed from pending downloads
This commit is contained in:
Bradley Austin Davis 2018-03-12 15:04:40 -07:00 committed by GitHub
commit f48db825c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -459,6 +459,10 @@ void NetworkTexture::makeRequest() {
} }
void NetworkTexture::handleLocalRequestCompleted() {
TextureCache::requestCompleted(_self);
}
void NetworkTexture::makeLocalRequest() { void NetworkTexture::makeLocalRequest() {
const QString scheme = _url.scheme(); const QString scheme = _url.scheme();
QString path; QString path;
@ -468,6 +472,8 @@ void NetworkTexture::makeLocalRequest() {
path = ":" + _url.path(); path = ":" + _url.path();
} }
connect(this, &Resource::finished, this, &NetworkTexture::handleLocalRequestCompleted);
path = FileUtils::selectFile(path); path = FileUtils::selectFile(path);
auto storage = std::make_shared<storage::FileStorage>(path); auto storage = std::make_shared<storage::FileStorage>(path);

1
libraries/model-networking/src/model-networking/TextureCache.h
View file

@ -71,6 +71,7 @@ public slots:
protected: protected:
void makeRequest() override; void makeRequest() override;
void makeLocalRequest(); void makeLocalRequest();
Q_INVOKABLE void handleLocalRequestCompleted();
virtual bool isCacheable() const override { return _loaded; } virtual bool isCacheable() const override { return _loaded; }