Merge pull request #16032 from meeseeksmachine/auto-backport-of-pr-16028-on-v3.1.x

QuLogic · web-flow · commit 787fccea3ade · 2019-12-30T03:40:57.000-05:00
Backport PR #16028 on branch v3.1.x (Prevent FigureCanvasQT_draw_idle recursively calling itself.)
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -498,17 +498,16 @@ def draw_idle(self):
             QtCore.QTimer.singleShot(0, self._draw_idle)
 
     def _draw_idle(self):
-        if self.height() < 0 or self.width() < 0:
-            self._draw_pending = False
         if not self._draw_pending:
             return
+        self._draw_pending = False
+        if self.height() < 0 or self.width() < 0:
+            return
         try:
             self.draw()
         except Exception:
             # Uncaught exceptions are fatal for PyQt5, so catch them instead.
             traceback.print_exc()
-        finally:
-            self._draw_pending = False
 
     def drawRectangle(self, rect):
         # Draw the zoom rectangle to the QPainter.  _draw_rect_callback needs
