X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fvidwhacker;h=4652aab4d48f7852f399280255f455687d237288;hp=a2ab029b99c0cb54e99b8660e75ada37f0bde51e;hb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;hpb=481b95e2617b69e6fd4444432747d7e1e0c3dc85

diff --git a/hacks/vidwhacker b/hacks/vidwhacker
index a2ab029b..4652aab4 100755
--- a/hacks/vidwhacker
+++ b/hacks/vidwhacker
@@ -274,7 +274,7 @@ main() {
 
   getargs $@
 
-  trap my_trap 0 1 2 3 6 9 13
+  trap my_trap 0 1 2 3 6 9 13 15
 
   if [ "$use_stdin" = true ]; then
    cat > $tmp_ppm0
@@ -311,8 +311,15 @@ main() {
 	  ls -lF $tmp_ppm2
         fi
 
-	# cat the file so that we can nuke it without racing against xv.
-        cat $tmp_ppm2 | xv $xvargs - &
+	mv $tmp_ppm2 $tmp_ppm0
+        xv $xvargs $tmp_ppm0 &
+
+# this doesn't work -- leaves xv processes around, instead of stray xset
+# data.  Sigh.
+#
+#	# cat the file so that we can nuke it without racing against xv.
+#        cat $tmp_ppm2 | xv $xvargs - &
+
         pid=$!
       fi
     fi