Merge pull request #2677 from tacaswell/fix_2583

Make sure self._idle is set to `True` in all cases
matplotlib · Dec 18, 2013 · 8c16c61 · 8c16c61
2 parents 1a9fa9e + a6fbc7f
commit 8c16c61
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -376,8 +376,10 @@ def draw(self):
 
     def draw_idle(self):
         def idle_draw(*args):
-            self.draw()
-            self._idle_draw_id = 0
+            try:
+                self.draw()
+            finally:
+                self._idle_draw_id = 0
             return False
         if self._idle_draw_id == 0:
             self._idle_draw_id = gobject.idle_add(idle_draw)

diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -322,8 +322,10 @@ def draw(self):
 
     def draw_idle(self):
         def idle_draw(*args):
-            self.draw()
-            self._idle_draw_id = 0
+            try:
+                self.draw()
+            finally:
+                self._idle_draw_id = 0
             return False
         if self._idle_draw_id == 0:
             self._idle_draw_id = GObject.idle_add(idle_draw)

diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -415,8 +415,10 @@ def draw_idle(self):
         self._idle = False
 
         def idle_draw(*args):
-            self.draw()
-            self._idle = True
+            try:
+                self.draw()
+            finally:
+                self._idle = True
         if d:
             QtCore.QTimer.singleShot(0, idle_draw)
 

diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -362,8 +362,10 @@ def draw_idle(self):
         d = self._idle
         self._idle = False
         def idle_draw(*args):
-            self.draw()
-            self._idle = True
+            try:
+                self.draw()
+            finally:
+                self._idle = True
 
         if d:
             self._idle_callback = self._tkcanvas.after_idle(idle_draw)