From fe4344794b6d71cb51a54dfcbab6943cf9a8a0c8 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Wed, 25 Aug 2021 16:30:47 +0200
Subject: [PATCH] Workarounds for #124 (does not solve it)

---
 dev/Settings/User/Folders.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 45b137270..1e7a22356 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -96,14 +96,21 @@ export class FoldersUserSettings {
 			if (folderToRemove) {
 				Local.set(ClientSideKeyName.FoldersLashHash, '');
 
-				folderToRemove.selectable(false);
-
-				rl.app.foldersPromisesActionHelper(
-					Remote.folderDelete(folderToRemove.fullNameRaw),
-					Notification.CantDeleteFolder
-				);
-
-				removeFolderFromCacheList(folderToRemove.fullNameRaw);
+				// rl.app.foldersPromisesActionHelper
+				Remote.abort('Folders')
+					.folderDelete(folderToRemove.fullNameRaw)
+					.then(
+						() => {
+							folderToRemove.selectable(false)
+							removeFolderFromCacheList(folderToRemove.fullNameRaw);
+						},
+						error => {
+							FolderUserStore.folderListError(
+								getNotification(error.code, '', Notification.CantDeleteFolder)
+								+ '.\n' + error.message
+							);
+						}
+					);
 			}
 		} else if (0 < folderToRemove.privateMessageCountAll()) {
 			FolderUserStore.folderListError(getNotification(Notification.CantDeleteNonEmptyFolder));