From 1e00962fb7055173ba3d0efa8b75e54e5065e8da Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 21 Feb 2013 15:08:23 -0800 Subject: [PATCH] fix crash on match to active socket, remove LD debug --- interface/src/main.cpp | 1 - shared/src/AgentList.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index b360abc512..28f7050f42 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -873,7 +873,6 @@ void mouseoverFunc( int x, int y) void attachNewHeadToAgent(Agent *newAgent) { if (newAgent->linkedData == NULL) { newAgent->linkedData = new Head(); - std::cout << "LD: " << newAgent->linkedData << "\n"; } } diff --git a/shared/src/AgentList.cpp b/shared/src/AgentList.cpp index 698bdec70a..09ed0ecfba 100644 --- a/shared/src/AgentList.cpp +++ b/shared/src/AgentList.cpp @@ -70,7 +70,7 @@ void AgentList::updateAgentWithData(sockaddr *senderAddress, void *packetData, s int AgentList::indexOfMatchingAgent(sockaddr *senderAddress) { for(std::vector::iterator agent = agents.begin(); agent != agents.end(); agent++) { - if (socketMatch(agent->activeSocket, senderAddress)) { + if (agent->activeSocket != NULL && socketMatch(agent->activeSocket, senderAddress)) { return agent - agents.begin(); } }