Merge pull request #3596 from matrix-org/dbkr/fix_editing_softcrash

Fix softcrash if editing silly events
matrix-org · Nov 6, 2019 · e2acc90 · e2acc90
2 parents d14c0c3 + 0464b09
commit e2acc90
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
@@ -52,6 +52,7 @@ export function canEditContent(mxEvent) {
     const content = mxEvent.getOriginalContent();
     const {msgtype} = content;
     return (msgtype === "m.text" || msgtype === "m.emote") &&
+        content.body && typeof content.body === 'string' &&
         mxEvent.getSender() === MatrixClientPeg.get().getUserId();
 }