From: Nathaniel Wesley Filardo Date: Tue, 2 Jun 2020 19:18:43 +0000 (+0100) Subject: Messages: advance lastMessageTime on message reset X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=7e0abfe3f48ae9ff19c9231fe0ba7ef1c3f79f27;p=acmetensortoys-ctfws-android Messages: advance lastMessageTime on message reset --- diff --git a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java index bfa660c..67c669d 100644 --- a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java +++ b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java @@ -300,6 +300,7 @@ public class CtFwSGameStateManager { } public void onMessageReset(long before) { synchronized(this) { + lastMsgTimestamp = Long.max(before, lastMsgTimestamp); if (!msgs.isEmpty() && msgs.first().when <= before) { msgs = msgs.tailSet(new Msg(before, "")); }