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
This commit is contained in:
@@ -516,12 +516,6 @@ public class Client
|
|||||||
return false;
|
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
|
// ask the communicator to send a logoff message and disconnect from the server
|
||||||
_comm.logoff();
|
_comm.logoff();
|
||||||
|
|
||||||
@@ -818,6 +812,12 @@ public class Client
|
|||||||
_connectionId = _cloid = -1;
|
_connectionId = _cloid = -1;
|
||||||
_standalone = false;
|
_standalone = false;
|
||||||
|
|
||||||
|
// kill our tick interval
|
||||||
|
if (_tickInterval != null) {
|
||||||
|
_tickInterval.cancel();
|
||||||
|
_tickInterval = null;
|
||||||
|
}
|
||||||
|
|
||||||
// and let our invocation director know we're logged off
|
// and let our invocation director know we're logged off
|
||||||
_invdir.cleanup();
|
_invdir.cleanup();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user