X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fpinion.c;h=860d015c73ac3dcb0e2b396cc5857d16d9975c0f;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=644ff615db3a631e09c5772a9d9bbfcd177bcede;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/glx/pinion.c b/hacks/glx/pinion.c
index 644ff615..860d015c 100644
--- a/hacks/glx/pinion.c
+++ b/hacks/glx/pinion.c
@@ -1,4 +1,4 @@
-/* pinion, Copyright (c) 2004-2008 Jamie Zawinski <jwz@jwz.org>
+/* pinion, Copyright (c) 2004-2011 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -883,6 +883,7 @@ push_gear (ModeInfo *mi)
 
   if (g->coax_p)
     {
+      if (!parent) abort();
       if (g->x != parent->x) abort();
       if (g->y != parent->y) abort();
       if (g->z == parent->z) abort();
@@ -1340,8 +1341,6 @@ init_pinion (ModeInfo *mi)
       fprintf(stderr, "%s: out of memory\n", progname);
       exit(1);
     }
-
-    pp = &pps[MI_SCREEN(mi)];
   }
 
   pp = &pps[MI_SCREEN(mi)];
@@ -1350,6 +1349,7 @@ init_pinion (ModeInfo *mi)
 
   load_fonts (mi);
   reshape_pinion (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+  clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
 
   pp->title_list  = glGenLists (1);