stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed double deletetion of User class when there's connection error

Browse source
This commit is contained in:
HanzZ 2011-06-30 19:05:47 +02:00
parent 34207065ce
commit d969b37743
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
spectrum_manager/src/spectrum_manager.cfg
View file

@ -1,7 +1,8 @@
[service]
admin_username=admin
admin_password=test
admin_username=admin_
admin_password=test_
[servers]
server=localhost
server=icq.spectrum.im
#server=localhost
server=icq.spectrum.im
server=msn.spectrum.im

8
src/user.cpp
View file

@ -158,11 +158,15 @@ void User::handleDisconnected(const std::string &error) {
msg->setFrom(m_component->getJID());
m_component->getStanzaChannel()->sendMessage(msg);
// In server mode, server finishes the session and pass unavailable session to userManager,
// so we can't removeUser() in server mode, because it would be removed twice.
// Once in finishSession and once in m_userManager->removeUser.
if (m_component->inServerMode()) {
dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
}
m_userManager->removeUser(this);
else {
m_userManager->removeUser(this);
}
}
}