From cbb8432873937e0fb4c03b26a5f7194b7cac907a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 9 May 2018 01:03:40 +0100
Subject: [PATCH] unbreak switching from draft to slate

---
 src/ComposerHistoryManager.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js
index 9a6970a376..ce0eb8f0c3 100644
--- a/src/ComposerHistoryManager.js
+++ b/src/ComposerHistoryManager.js
@@ -74,7 +74,7 @@ class HistoryItem {
                 return this.value;
             }
         }
-        log.error("unknown format -> outputFormat conversion");
+        console.error("unknown format -> outputFormat conversion");
         return this.value;
     }
 }
@@ -91,9 +91,14 @@ export default class ComposerHistoryManager {
         // TODO: Performance issues?
         let item;
         for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
-            this.history.push(
-                HistoryItem.fromJSON(JSON.parse(item))
-            );
+            try {
+                this.history.push(
+                    HistoryItem.fromJSON(JSON.parse(item))
+                );
+            }
+            catch (e) {
+                console.warn("Throwing away unserialisable history", e);
+            }
         }
         this.lastIndex = this.currentIndex;
     }