Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-10-28 19:40:51 +0300
committernpmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>2020-10-28 23:40:01 +0300
commit85ae8d5c9f1c0390461968d8822c7eea178f5fc3 (patch)
tree7ff9746eb73a5f6fa8527c3f495d5c3113447700 /core/src
parente3e6bc5972668b004fca4d337ca76841a1e06edc (diff)
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>
Diffstat (limited to 'core/src')
-rw-r--r--core/src/OC/dialogs.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index 9f2a24a4deb..e7e5ca4d310 100644
--- a/core/src/OC/dialogs.js
+++ b/core/src/OC/dialogs.js
@@ -930,7 +930,11 @@ const Dialogs = {
closeButton: null,
close: function() {
self._fileexistsshown = false
- $(this).ocdialog('destroy').remove()
+ try {
+ $(this).ocdialog('destroy').remove()
+ } catch (e) {
+ // ignore
+ }
}
})