Skip to content

Commit ca3de9d

Browse files
committed
fix one more race condition
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent c16c72e commit ca3de9d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/assistant.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,13 @@ export async function pollTaskPosition(taskId, obj, callback = updateTaskPositio
465465
const { isCancel } = await import('@nextcloud/axios')
466466
return new Promise((resolve, reject) => {
467467
const pollPositionOnce = () => {
468-
if (window.assistantPollPositionTaskId !== taskId) {
468+
if (window.assistantPollPositionTaskId !== taskId || window.assistantPollPositionTimerId === null) {
469469
reject(new Error('pollTaskPosition cancelled'))
470470
return
471471
}
472472
getTaskPosition(taskId, window.assistantPollPositionAbortController.signal).then(response => {
473473
const taskPosition = response.data?.ocs?.data
474-
if (window.assistantPollPositionTaskId !== taskId) {
474+
if (window.assistantPollPositionTaskId !== taskId || window.assistantPollPositionTimerId === null) {
475475
reject(new Error('pollTaskPosition cancelled'))
476476
return
477477
}
@@ -528,7 +528,7 @@ export async function pollTask(taskId, obj, updateOutput = true, callback = upda
528528
const pollOnce = () => {
529529
getTask(taskId, window.assistantPollAbortController.signal).then(response => {
530530
const task = response.data?.ocs?.data?.task
531-
if (window.assistantPollTaskId !== taskId) {
531+
if (window.assistantPollTaskId !== taskId || window.assistantPollTimerId === null) {
532532
reject(new Error('pollTask cancelled'))
533533
return
534534
}

0 commit comments

Comments
 (0)