mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testfix for 1746996

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@539 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2007-07-04 22:45:10 +00:00
parent 4dc29c6920
commit bfe22705cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/murmur/Server.cpp
View File

@ -710,7 +710,7 @@ void MessageServerAuthenticate::process(Connection *cCon) {
else if (! ChanACL::hasPermission(pSrcPlayer, lc, ChanACL::Enter))
lc = Channel::get(0);
g_sServer->playerEnterChannel(pSrcPlayer, lc, true);
// g_sServer->playerEnterChannel(pSrcPlayer, lc, true);
ServerDB::conLoggedOn(pSrcPlayer, cCon);
QQueue<Channel *> q;
@ -794,6 +794,7 @@ void MessageServerAuthenticate::process(Connection *cCon) {
g_sServer->sendMessage(cCon, &mpm);
}
g_sServer->playerEnterChannel(pSrcPlayer, lc, false);
MessageServerSync mssMsg;
mssMsg.sPlayerId = pSrcPlayer->sId;
@ -803,7 +804,6 @@ void MessageServerAuthenticate::process(Connection *cCon) {
g_sServer->log(QString("Authenticated: %1").arg(qsUsername), cCon);
dbus->playerConnected(pSrcPlayer);
g_sServer->playerEnterChannel(pSrcPlayer, lc, false);
}
void MessageServerBanList::process(Connection *cCon) {

2
src/murmur/ServerDB.cpp
View File

@ -526,7 +526,7 @@ void ServerDB::conLoggedOn(Player *p, Connection *con) {
query.prepare("INSERT INTO connections (con_id, player_id, channel_id, player_name, ip, port) VALUES (?,?,?,?,?,?)");
query.addBindValue(p->sId);
query.addBindValue(p->iId);
query.addBindValue(p->cChannel->iId);
query.addBindValue(QVariant());
query.addBindValue(p->qsName);
query.addBindValue(con->peerAddress().toString());
query.addBindValue(con->peerPort());