X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fpinion.c;h=8ba2ee0ee4d7c37f0edf80a5e9295293cf322f43;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hp=aefbe711464f687078b07d793a2bdc465706ae74;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver

diff --git a/hacks/glx/pinion.c b/hacks/glx/pinion.c
index aefbe711..8ba2ee0e 100644
--- a/hacks/glx/pinion.c
+++ b/hacks/glx/pinion.c
@@ -12,9 +12,9 @@
 #define DEFAULTS        "*delay:        15000              \n" \
                         "*showFPS:      False              \n" \
                         "*wireframe:    False              \n" \
-                        "*titleFont:  -*-times-bold-r-normal-*-180-*\n" \
-                        "*titleFont2: -*-times-bold-r-normal-*-120-*\n" \
-                        "*titleFont3: -*-times-bold-r-normal-*-80-*\n"  \
+                        "*titleFont:  -*-helvetica-medium-r-normal-*-180-*\n" \
+                        "*titleFont2: -*-helvetica-medium-r-normal-*-120-*\n" \
+                        "*titleFont3: -*-helvetica-medium-r-normal-*-80-*\n"  \
 
 # define refresh_pinion 0
 # define release_pinion 0
@@ -165,7 +165,7 @@ new_label (ModeInfo *mi)
       print_gl_string (mi->dpy, f, fl,
                        mi->xgwa.width, mi->xgwa.height,
                        10, mi->xgwa.height - 10,
-                       label);
+                       label, False);
     }
   glEndList ();
 }
@@ -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)];