From 3e73fe49baf0d80ab7829a3a4bba19f727492be7 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Sat, 26 Oct 2019 01:39:59 +0200
Subject: [PATCH] Improved file transfer error handling

---
 shared/js/ui/modal/ModalIconSelect.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shared/js/ui/modal/ModalIconSelect.ts b/shared/js/ui/modal/ModalIconSelect.ts
index ec6f9292..42911e61 100644
--- a/shared/js/ui/modal/ModalIconSelect.ts
+++ b/shared/js/ui/modal/ModalIconSelect.ts
@@ -322,8 +322,10 @@ namespace Modals {
                         html_tag: html.append(indicator).append(message),
                         set_value: set_value,
                         set_message: msg => message.text(msg),
-                        set_error: msg => {
-                            message.text(tr("error: ") + msg);
+                        set_error: (msg: string) => {
+                            let index = msg.lastIndexOf(':');
+                            message.text(index == -1 ? msg : msg.substring(index + 1));
+                            message.attr('title', msg);
                             set_value(100);
                             indicator.removeClass("bg-success").addClass("bg-danger");
                         }
@@ -412,6 +414,8 @@ namespace Modals {
                         console.error(tr("Icon upload failed for icon %s: %o"), icon.file.name, error);
                         if(typeof(error) === "string")
                             bar.set_error(tr("upload failed: ") + error);
+                        else if(typeof(error.message) === "string")
+                            bar.set_error(tr("upload failed: ") + error.message);
                         else
                             bar.set_error(tr("upload failed"));
                         icon.upload_state = "error";