Merge pull request matplotlib#2648 from JamesMakela/master

Update backend_webagg.py

Author: tacaswell

lib/matplotlib/backends/backend_webagg.py

@@ -28,6 +28,7 @@
     import tornado
 except ImportError:
     raise RuntimeError("The WebAgg backend requires Tornado.")
+
 import tornado.web
 import tornado.ioloop
 import tornado.websocket
@@ -254,7 +255,9 @@ def open(self, fignum):
                 self.set_nodelay(True)
 
         def on_close(self):
-            Gcf.get_fig_manager(self.fignum).remove_web_socket(self)
+            manager = Gcf.get_fig_manager(self.fignum)
+            if manager is not None:
+                manager.remove_web_socket(self)
 
         def on_message(self, message):
             message = json.loads(message)
@@ -265,7 +268,11 @@ def on_message(self, message):
                 self.supports_binary = message['value']
             else:
                 manager = Gcf.get_fig_manager(self.fignum)
-                manager.handle_json(message)
+                # It is possible for a figure to be closed,
+                # but a stale figure UI is still sending messages
+                # from the browser.
+                if manager is not None:
+                    manager.handle_json(message)
 
         def send_json(self, content):
             self.write_message(json.dumps(content))

lib/matplotlib/backends/web_backend/mpl.js

@@ -396,7 +396,7 @@ mpl.figure.prototype.toolbar_button_onclick = function(name) {
     if (name == 'download') {
         var format_dropdown = this.format_dropdown;
         var format = format_dropdown.options[format_dropdown.selectedIndex].value;
-        this.ondownload(figure, format);
+        this.ondownload(this, format);
     } else {
         this.send_message("toolbar_button", {name: name});
     }