Changeset - 6cabfd73ff78
[Not reviewed]
0 2 0
HanzZ - 14 years ago 2011-11-14 18:38:58
hanzz.k@gmail.com
Fixed crash in getJIDWithFeature
2 files changed with 4 insertions and 6 deletions:
0 comments (0 inline, 0 general)
src/rostermanager.cpp
Show inline comments
 
@@ -141,8 +141,6 @@ void RosterManager::handleBuddyChanged(Buddy *buddy) {
 
}
 

	
 
void RosterManager::setBuddyCallback(Buddy *buddy) {
 
	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 

	
 
	LOG4CXX_INFO(logger, "Associating buddy " << buddy->getName() << " with " << m_user->getJID().toString());
 
	m_buddies[buddy->getName()] = buddy;
 
	onBuddySet(buddy);
 
@@ -153,9 +151,6 @@ void RosterManager::setBuddyCallback(Buddy *buddy) {
 
		sendBuddyRosterPush(buddy);
 
	}
 
	else {
 
		if (m_setBuddyTimer->onTick.empty()) {
 
			m_setBuddyTimer->stop();
 

	
 
		if (m_supportRemoteRoster) {
 
			sendBuddyRosterPush(buddy);
 
		}
 
@@ -170,7 +165,6 @@ void RosterManager::setBuddyCallback(Buddy *buddy) {
 
			}
 
		}
 
	}
 
	}
 

	
 
	if (m_rosterStorage)
 
		m_rosterStorage->storeBuddy(buddy);
src/user.cpp
Show inline comments
 
@@ -97,6 +97,10 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
 
			else {
 
				continue;
 
			}
 

	
 
			if (!discoInfo) {
 
				continue;
 
			}
 
#else
 
			continue;
 
#endif
0 comments (0 inline, 0 general)