summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mbgl/style/source.cpp4
-rw-r--r--src/mbgl/style/source.hpp1
-rw-r--r--src/mbgl/style/style.cpp2
3 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp
index c3265a7b41..639c563a64 100644
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -59,10 +59,6 @@ bool Source::isLoaded() const {
return true;
}
-bool Source::isLoading() const {
- return !loaded && req.operator bool();
-}
-
void Source::invalidateTiles() {
tiles.clear();
renderTiles.clear();
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp
index 193f73da4d..485f3446ca 100644
--- a/src/mbgl/style/source.hpp
+++ b/src/mbgl/style/source.hpp
@@ -43,7 +43,6 @@ public:
bool loaded = false;
virtual void load(FileSource&) = 0;
- bool isLoading() const;
bool isLoaded() const;
const Tileset* getTileset() const { return tileset.get(); }
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 2fe4810a5a..5dd00bd309 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -214,7 +214,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) {
Source* source = getSource(layer->baseImpl->source);
if (source && layer->baseImpl->needsRendering()) {
source->enabled = true;
- if (!source->loaded && !source->isLoading()) {
+ if (!source->loaded) {
source->load(fileSource);
}
}