From 6fd079bfb0827df1ba09d60507fecb7c3f6f2a27 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 22 Jan 2020 15:47:12 +0100
Subject: [PATCH] Clean images in onlyoffice

---
 www/common/onlyoffice/inner.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 54434adb6..1269039a8 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -678,7 +678,7 @@ define([
                             var m = metadataMgr.getChannelMembers().slice().filter(function (nId) {
                                 return nId.length === 32;
                             });
-                            if (m.length === 1 && !APP.loadingImage) {
+                            if (m.length === 1 && APP.loadingImage <= 0) {
                                 try {
                                     var docs = window.frames[0].AscCommon.g_oDocumentUrls.urls || {};
                                     var mediasSources = getMediasSources();
@@ -867,19 +867,21 @@ define([
                                 return void callback("");
                             }
 
-                            var blobUrl = URL.createObjectURL(res.content);
-                            // store media blobUrl and content for cache and export
-                            var mediaData = { blobUrl : blobUrl, content : "" };
-                            mediasData[data.src] = mediaData;
-                            var reader = new FileReader();
-                            reader.onloadend = function () {
-                                debug("MediaData set");
-                                mediaData.content = reader.result;
-                            };
-                            reader.readAsArrayBuffer(res.content);
-                            debug("Adding CryptPad Image " + data.name + ": " +  blobUrl);
-                            window.frames[0].AscCommon.g_oDocumentUrls.addImageUrl(data.name, blobUrl);
-                            callback(blobUrl);
+                            try {
+                                var blobUrl = URL.createObjectURL(res.content);
+                                // store media blobUrl and content for cache and export
+                                var mediaData = { blobUrl : blobUrl, content : "" };
+                                mediasData[data.src] = mediaData;
+                                var reader = new FileReader();
+                                reader.onloadend = function () {
+                                    debug("MediaData set");
+                                    mediaData.content = reader.result;
+                                };
+                                reader.readAsArrayBuffer(res.content);
+                                debug("Adding CryptPad Image " + data.name + ": " +  blobUrl);
+                                window.frames[0].AscCommon.g_oDocumentUrls.addImageUrl(data.name, blobUrl);
+                                callback(blobUrl);
+                            } catch (e) {}
                         });
                     } catch (e) {
                         APP.loadingImage--;