X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ftunnel_draw.c;h=9398d18806724caa88c6b65bb9756760b39c9a27;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=c87fea9dd57a875f4989df065180b2c6144d21aa;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/tunnel_draw.c b/hacks/glx/tunnel_draw.c
index c87fea9d..9398d188 100644
--- a/hacks/glx/tunnel_draw.c
+++ b/hacks/glx/tunnel_draw.c
@@ -207,6 +207,7 @@ static void LoadPath(struct tunnel_state *st)
 		}
 		else
 		{
+			if (!path1) path1 = st->path;
 			path2 = (tnPath *)malloc(sizeof(tnPath));
 			path1->next = path2;
 			path1 = path2;
@@ -249,7 +250,9 @@ void DrawTunnel(struct tunnel_state *st,
 	
 	cmpos = st->cam_pos;
 	/* Get current curve */
-	if (st->cam_pos->next->next->next)
+	if (st->cam_pos->next &&
+            st->cam_pos->next->next &&
+            st->cam_pos->next->next->next)
 	{
 		p1 = st->cam_pos;
 		for (i=0; i<4; i++)