'SC'

Steve Chaplin · Steve Chaplin · commit 48bd72411b4c · 2006-02-26T12:09:46.000Z
svn path=/trunk/matplotlib/; revision=2094
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-02-26 Update the previous gtk.main_quit() bug fix to use gtk.main_level()
+           - SC
+
 2006-02-24 Implemented alpha support in contour and contourf - EF
 
 2006-02-22 Fixed gtk main quit bug when quit was called before
@@ -15,7 +18,7 @@
 
 2006-02-21 Fixed portrait/landscape orientation in postscript backend - DSD
 
-2006-02-21 fix bug introduced in yesterday's bug fix - SC
+2006-02-21 Fix bug introduced in yesterday's bug fix - SC
 
 2006-02-20 backend_gtk.py FigureCanvasGTK.draw(): fix bug reported by
            David Tremouilles - SC
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -77,8 +77,6 @@ def show(mainloop=True):
 
     if mainloop and gtk.main_level() == 0:
         gtk.main()
-        show._mainloop = True
-show._mainloop = False
 
 def new_figure_manager(num, *args, **kwargs):
     """
@@ -454,8 +452,10 @@ def destroy(self, *args):
         if _debug: print 'FigureManagerGTK.%s' % fn_name()
         self.window.destroy()
 
-        if Gcf.get_num_fig_managers()==0 and not matplotlib.is_interactive():
-            if show._mainloop: gtk.main_quit()
+        if Gcf.get_num_fig_managers()==0 and \
+               not matplotlib.is_interactive() and \
+               gtk.main_level() >= 1:
+            gtk.main_quit()
 
 
     def full_screen_toggle (self):
