X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fvermiculate.c;h=4d816ff63adbf5271c5496a77c04f8e1347d7e0a;hp=c50785afda811afd6510ef267b9a2977ded15a6a;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hpb=dba664f31aa87285db4d76cf8c5e66335299703a

diff --git a/hacks/vermiculate.c b/hacks/vermiculate.c
index c50785af..4d816ff6 100644
--- a/hacks/vermiculate.c
+++ b/hacks/vermiculate.c
@@ -816,6 +816,12 @@ vermiculate_reshape (Display *dpy, Window window, void *closure,
 static Bool
 vermiculate_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
+  struct state *st = (struct state *) closure;
+  if (screenhack_event_helper (dpy, window, event))
+    {
+      st->reset_p = 1;
+      return True;
+    }
   return False;
 }
 
@@ -882,8 +888,9 @@ consume_instring(struct state *st)
 block in which it's invoked, since it declares variables: */
 #define forallinbank(LDP) linedata *LDP; int bankc; \
 		for (bankc = 1;	\
-		(LDP = &st->thread[st->bank[bankc - 1] - 1],	\
-		bankc <= st->bnkt); bankc++)
+		((bankc <= st->bnkt) ? ( \
+			(LDP = &st->thread[st->bank[bankc - 1] - 1],	1) \
+			) : 0) ; bankc++)
 			      {
 				forallinbank (L) L->slice = degs / (st->ch - '0');
 			      }