[stable27] fix(dialogs): Make sure conflict dialog is loaded before adding conflicts#45664
Merged
[stable27] fix(dialogs): Make sure conflict dialog is loaded before adding conflicts#45664
Conversation
4 tasks
…icts Fixes a possible race condition where conflicts are added and the dialog loading finishes only afterwards. The race condition sometimes led to missing files in the conflict dialog when uploading several existing files at once. Fixes: #45661
mejo-
force-pushed
the
fix/upload_conflict_race
branch
from
d8dab61 to
f3cd03b
Compare
miaulalala
approved these changes
Jun 5, 2024
Member
Author
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a possible race condition where conflicts are added and the dialog loading finishes only afterwards.
The race condition sometimes led to missing files in the conflict dialog when uploading several existing files at once.
Fixes: #45661
Checklist