From 7862ac090a715f0c6d39395264e1cb13f843df67 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 22 Jun 2011 18:16:40 +0000 Subject: [PATCH] We shouldn't call disconnectedFromPeer if we don't have a nodeobj yet, because we wouldn't have called connectedToPeer. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6665 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/peer/server/PeerNode.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/threerings/presents/peer/server/PeerNode.java b/src/main/java/com/threerings/presents/peer/server/PeerNode.java index 3f9e86bb6..cd0e3f610 100644 --- a/src/main/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/main/java/com/threerings/presents/peer/server/PeerNode.java @@ -213,14 +213,15 @@ public class PeerNode // documentation inherited from interface ClientObserver public void clientDidLogoff (Client client) { - if (nodeobj != null) { - String nodeName = getNodeName(); - for (ClientInfo clinfo : nodeobj.clients) { - _peermgr.clientLoggedOff(nodeName, clinfo); - } - - nodeobj.removeListener(_listener); + if (nodeobj == null) { + return; } + String nodeName = getNodeName(); + for (ClientInfo clinfo : nodeobj.clients) { + _peermgr.clientLoggedOff(nodeName, clinfo); + } + + nodeobj.removeListener(_listener); _peermgr.disconnectedFromPeer(this); _listener = null;