From 85ae8d5c9f1c0390461968d8822c7eea178f5fc3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Wed, 28 Oct 2020 17:40:51 +0100
Subject: 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>
---
 core/src/OC/dialogs.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/src')

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
+						}
 					}
 				})
 
-- 
cgit v1.2.3