Changeset 275 for trunk/hiptop/pester/net/sabi/pester/Alarm.java

Timestamp:

07/22/06 05:28:37 (18 years ago)

Author:

Nicholas Riley

Message:

Fix bug with alarm update interval; update tooltip when time changes.

File:

• trunk/hiptop/pester/net/sabi/pester/Alarm.java (modified) (1 diff)

trunk/hiptop/pester/net/sabi/pester/Alarm.java

@@ -251 +251 @@
     public int getSecondsUntilNextIntervalStringUpdate() {
         int i = remainingInterval();
-        if (i == 1)
+        if (i <= 1)
             return 0;
         if (i <= 60)
             return 1;
-        if (i <= 24 * 60 * 60)
-            return i % 60;
-        return i % 3600; // update at least once an hour, regardless
+        if (i <= 24 * 60 * 60) {
+            i %= 60;
+            return (i == 0 ? 60 : i);
+        }
+        i %= 3600;
+        return (i == 0 ? 3600 : i);
     }