diff --git a/src/java/com/threerings/media/HourglassView.java b/src/java/com/threerings/media/HourglassView.java index 6e90b7e81..50dc608cc 100644 --- a/src/java/com/threerings/media/HourglassView.java +++ b/src/java/com/threerings/media/HourglassView.java @@ -81,7 +81,7 @@ public class HourglassView extends TimerView super.tick(tickStamp); // check if the sand should be updated - if (tickStamp > _sandStamp) { + if (_enabled && _running && tickStamp > _sandStamp) { // update the sand frame setSandTrickleY(); diff --git a/src/java/com/threerings/media/TimerView.java b/src/java/com/threerings/media/TimerView.java index 1b4c259dc..c3767e328 100644 --- a/src/java/com/threerings/media/TimerView.java +++ b/src/java/com/threerings/media/TimerView.java @@ -315,6 +315,10 @@ public class TimerView // documentation inherited public void tick (long now) { + if (!_enabled) { + return; + } + // Initialize the starting time if necessary if (_start == Long.MIN_VALUE) { _start = now - Math.round(_duration * _complete);