From 2187609696ed4de9ba115475372ad108647c0a56 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 7 Nov 2008 18:46:36 +0000 Subject: [PATCH] Stop our tick interval in cleanup() rather than logoff(). Logoff is not always initiated by the client, but we always want to stop our ticking. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5519 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/client/Client.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index 0086c4b9b..5b73449e6 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -516,12 +516,6 @@ public class Client return false; } - // kill our tick interval - if (_tickInterval != null) { - _tickInterval.cancel(); - _tickInterval = null; - } - // ask the communicator to send a logoff message and disconnect from the server _comm.logoff(); @@ -818,6 +812,12 @@ public class Client _connectionId = _cloid = -1; _standalone = false; + // kill our tick interval + if (_tickInterval != null) { + _tickInterval.cancel(); + _tickInterval = null; + } + // and let our invocation director know we're logged off _invdir.cleanup();