More robust error prevention for saving block images.

blockpy-edu · Sep 17, 2020 · dff68f6 · dff68f6
1 parent 0bf7aa9
commit dff68f6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/block_editor.js b/src/block_editor.js
@@ -316,8 +316,8 @@ BlockMirrorBlockEditor.prototype.loadBlocklyCSS = function() {
  *  base64-encoded PNG and the IMG tag.
  */
 BlockMirrorBlockEditor.prototype.getPngFromBlocks = function(callback) {
-    this.loadBlocklyCSS();
     try {
+        this.loadBlocklyCSS();
         // Retreive the entire canvas, strip some unnecessary tags
         var blocks = this.workspace.svgBlockCanvas_.cloneNode(true);
         blocks.removeAttribute("width");
@@ -350,6 +350,10 @@ BlockMirrorBlockEditor.prototype.getPngFromBlocks = function(callback) {
                 var canvas = document.createElement("canvas");
                 canvas.width = bbox.width;
                 canvas.height = bbox.height;
+                if (!canvas.width || !canvas.height) {
+                    callback("", img);
+                    return;
+                }
                 var ctx = canvas.getContext("2d");
                 ctx.drawImage(img, 0, 0);
                 var canvasUrl;