WIP: race condition?

tacaswell · tacaswell · commit 6678e029c566 · 2015-08-17T10:22:28.000-04:00
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -172,7 +172,10 @@ def destroy(self):
     def clearup_closed(self):
         """Clear up any closed Comms."""
         self.web_sockets = set([socket for socket in self.web_sockets
-                                if not socket.is_open()])
+                                if socket.is_open()])
+
+        if len(self.web_sockets) == 0:
+            self.manager.canvas.close_event()
 
 
 class TimerTornado(TimerBase):
@@ -284,8 +287,6 @@ def on_close(self):
         # When the socket is closed, deregister the websocket with
         # the FigureManager.
         self.comm.close()
-        self.manager.clearup_closed()
-        self.manager.canvas.close_event()
 
     def send_json(self, content):
         self.comm.send({'data': json.dumps(content)})
