Skip to content

Commit 85ae8d5

Browse files
catch errors when closing file conflict dialog
Signed-off-by: Robin Appelman <robin@icewind.nl> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
1 parent e3e6bc5 commit 85ae8d5

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

core/js/dist/login.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/OC/dialogs.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,11 @@ const Dialogs = {
930930
closeButton: null,
931931
close: function() {
932932
self._fileexistsshown = false
933-
$(this).ocdialog('destroy').remove()
933+
try {
934+
$(this).ocdialog('destroy').remove()
935+
} catch (e) {
936+
// ignore
937+
}
934938
}
935939
})
936940

0 commit comments

Comments
 (0)