From df6b0552e219f52c1bbe069b2d385948aca5d510 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 16 Nov 2019 20:35:04 +0100
Subject: [PATCH] Clear modules before load. Fixes #2402

---
 src/dom_components/index.js | 2 --
 src/editor/model/Editor.js  | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index 5259166c1..9cade9f70 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -389,8 +389,6 @@ export default () => {
       const isObj = result && result.constructor === Object;
 
       if ((result && result.length) || isObj) {
-        this.clear();
-
         // If the result is an object I consider it the wrapper
         if (isObj) {
           this.getWrapper().set(result);
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index a187c2998..279bf0d5d 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -508,7 +508,9 @@ export default Backbone.Model.extend({
    */
   load(clb = null) {
     this.getCacheLoad(1, res => {
-      this.get('storables').forEach(module => module.load(res));
+      const storables = this.get('storables');
+      storables.forEach(module => module.clear && module.clear());
+      storables.forEach(module => module.load(res));
       clb && clb(res);
     });
   },