Skip to content

Fix race condition in photos picker #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasdotcom merged 2 commits into from
Sep 24, 2026
Merged

Fix race condition in photos picker #367

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0e2ccd
Fix race condition in photos picker
MarcelRobitaille Sep 21, 2026
add4929
Implement review comments
lukasdotcom Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/PersonalSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,10 +827,16 @@ export default {
if (!this.pickerSessionId) {
return
}

// Save the picker session ID to throw out the response if it changed since the request was made
// There's a race condition if onImportPhotos resolved in the meantime
const pickerSessionIdOfRequest = this.pickerSessionId

const url = generateUrl('/apps/integration_google/picker-session')
axios.get(url, { params: { sessionId: this.pickerSessionId } })
.then((response) => {
if (response.data.mediaItemsSet === true && !this.startingPhotoImport) {
// Check pickerSessionId again to fix race condition (could have changed in the meantime)
if (response.data.mediaItemsSet === true && !this.startingPhotoImport && (pickerSessionIdOfRequest === this.pickerSessionId)) {
this.onImportPhotos()
}
})
Expand Down
Loading