diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-10-28 17:40:51 +0100 |
|---|---|---|
| committer | npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com> | 2020-10-29 09:10:33 +0000 |
| commit | eb59fd2baa1426ace43068b23486bd167d4a38d0 (patch) | |
| tree | 9f155bfb488235e92e8666574b535181b9ee9187 /core/src | |
| parent | 6f31880a6347fb1780df9048e61566959654b534 (diff) | |
| download | nextcloud-server-eb59fd2baa1426ace43068b23486bd167d4a38d0.tar.gz nextcloud-server-eb59fd2baa1426ace43068b23486bd167d4a38d0.zip | |
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.js | 6 |
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 + } } }) |