From 9f733ebc940760059ecf6321163b1c2f67a9098c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 16:55:33 +0000
Subject: [PATCH] Fix binding and promise handling

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index a35dc3d714..1180dd2df2 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -198,7 +198,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      */
     startListening() {
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.addEventListener("message", this.onMessage, false);
+            window.addEventListener("message", () => this.onMessage, false);
         }
         global.mxWidgetMessagingListenerCount += 1;
     }
@@ -209,7 +209,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     stopListening() {
         global.mxWidgetMessagingListenerCount -= 1;
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.removeEventListener("message", this.onMessage);
+            window.removeEventListener("message", () => this.onMessage);
         }
         if (global.mxWidgetMessagingListenerCount < 0) {
             // Make an error so we get a stack trace
@@ -367,10 +367,11 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * Request a screenshot from a widget
      */
     getScreenshot() {
-        const screenshot = this.exec({
+        this.exec({
             action: "screenshot",
+        }).then(function(screenshot) {
+            console.warn("got screenshot", screenshot);
         });
-        console.warn("got screenshot", screenshot);
     }
 }