gnome-games r7446 - in trunk/glchess: . src/lib/gtkui

[rancell svn gnome org]

Author: rancell
Date: Sun Mar  2 05:03:46 2008
New Revision: 7446
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7446&view=rev

Log:
Handle gtk.gtkgl.widget_get_gl_drawable() returning None (bugs #488902 and #512068).
	   


Modified:
   trunk/glchess/ChangeLog
   trunk/glchess/src/lib/gtkui/chessview.py

Modified: trunk/glchess/src/lib/gtkui/chessview.py
==============================================================================
--- trunk/glchess/src/lib/gtkui/chessview.py	(original)
+++ trunk/glchess/src/lib/gtkui/chessview.py	Sun Mar  2 05:03:46 2008
@@ -111,7 +111,7 @@
         glContext = gtk.gtkgl.widget_get_gl_context(self)
 
         # OpenGL begin.
-        if not glDrawable.gl_begin(glContext):
+        if glDrawable is None or not glDrawable.gl_begin(glContext):
             return
         
         self.__glDrawable = glDrawable
@@ -130,10 +130,8 @@
         
     def __endGL(self):
         """Free the OpenGL context"""
-        if not self.renderGL:
+        if self.__glDrawable is None or not self.renderGL:
             return
-        
-        assert(self.__glDrawable is not None)
         self.__glDrawable.gl_end()
         self.__glDrawable = None
         
@@ -155,7 +153,9 @@
         """Gtk+ signal"""
         if self.renderGL:
             self.__startGL()
-        
+            if self.__glDrawable is None:
+                return
+
             # Get the scene rendered
             try:
                 if self.view.feedback is not None: