Ensure reporting errors do not affect actions. Fixes #1116

NetsBlox · Oct 27, 2020 · 53e7f17 · 53e7f17
1 parent 6f4a5ac
commit 53e7f17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/actions-ext.js b/src/actions-ext.js
@@ -124,10 +124,11 @@ SnapActions.onReceiveAction = function(msg) {
 };
 
 SnapActions.completeAction = function(error) {
+    const result = ActionManager.prototype.completeAction.apply(this, arguments);
     if (error) {
         this.ide().submitBugReport(null, error);
     }
-    return ActionManager.prototype.completeAction.apply(this, arguments);
+    return result;
 };
 
 SnapActions.submitIfAllowed = function(event) {

diff --git a/src/netsblox.js b/src/netsblox.js
@@ -1044,7 +1044,11 @@ NetsBloxMorph.prototype.submitBugReport = function (desc, error) {
     report.clientUuid = this.sockets.uuid;
 
     // Add screenshot
-    report.screenshot = canvas.toDataURL('image/png');
+    try {
+        report.screenshot = canvas.toDataURL('image/png');
+    } catch (err) {
+        console.warn(`Unable to capture screenshot for bug report`, err);
+    }
 
     // Add project state
     report.project = this.serializer.serialize(this.stage);