From 8e8ea4c913ec1548dbcf3ee73045848b375eff04 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Thu, 5 Apr 2012 20:33:45 -0600
Subject: [PATCH] Working with 7.4.1

---
 src/org/woozle/penaltytimer/JammerButton.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/org/woozle/penaltytimer/JammerButton.java b/src/org/woozle/penaltytimer/JammerButton.java
index 3c3bffb..e8d2275 100644
--- a/src/org/woozle/penaltytimer/JammerButton.java
+++ b/src/org/woozle/penaltytimer/JammerButton.java
@@ -27,24 +27,28 @@ public class JammerButton extends TimerButton
     }
 
     public void onClick(View v) {
-        if (! paused) {
-            long orem = peer.remaining();
+        if (! paused && peer.running) {
+            penalized = true;
+
+            if (peer.penalized) {
+                // 7.4.1 -- Add a minute
+            } else {
+                // 7.4 -- Take a minute away from the other side
+                // if it goes negative, that's our time.
+                long orem = peer.remaining() - 60000;
 
-            if ((! running) && (! penalized) && (orem > 0)) {
-                orem -= 60000;
                 if (orem < 0) {
                     set(-orem);
                     start();
                     peer.set(0);
                     peer.stop();
-                    peer.penalized = true;
                 } else {
                     peer.set(orem);
                 }
-            } else {
-                super.onClick(v);
+                return;
             }
         }
+        super.onClick(v);
     }
 
     public void pause() {