aboutsummaryrefslogtreecommitdiff
path: root/src/services/timeline_fetcher/timeline_fetcher.service.js
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2018-04-14 14:26:07 +0300
committershpuld <shp@cock.li>2018-04-14 14:26:07 +0300
commit1a2bd28f53a430fddd90c7e92ff1c7d946764b59 (patch)
tree202470262c4c0c4e5d2b6b458ae7cbf50c64afd3 /src/services/timeline_fetcher/timeline_fetcher.service.js
parent424e9166d9d74891c4c81e67365ec73bb4532bcd (diff)
parent9587c6dac1b40ff07eb421b62010fbd98343a4d9 (diff)
Merge branch 'develop' into fix/status-heading-alignment-issues
Diffstat (limited to 'src/services/timeline_fetcher/timeline_fetcher.service.js')
-rw-r--r--src/services/timeline_fetcher/timeline_fetcher.service.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index a4a80df0..bb5fdc2e 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -30,7 +30,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
return apiService.fetchTimeline(args)
.then((statuses) => {
- if (!older && statuses.length >= 20) {
+ if (!older && statuses.length >= 20 && !timelineData.loading) {
store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId })
}
update({store, statuses, timeline, showImmediately})