Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Jemlich <pcgod@users.sourceforge.net>2011-05-20 11:23:20 +0400
committerBenjamin Jemlich <pcgod@users.sourceforge.net>2012-05-31 15:00:15 +0400
commit0159d50baa94ef094f0776e8b50580b36aea602c (patch)
treeb28769fb0ccc1b39f6448eba99601bda15e02b76 /src/murmur/MurmurIce.cpp
parentc2b7c00e51658e8c67ec7d4e97484ff34792eeab (diff)
Murmur: Allow temporary user name changes via Ice
Diffstat (limited to 'src/murmur/MurmurIce.cpp')
-rw-r--r--src/murmur/MurmurIce.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index 5b35fc6ac..d3b3330c2 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -1179,7 +1179,7 @@ static void impl_Server_setState(const ::Murmur::AMD_Server_setStatePtr cb, int
NEED_PLAYER;
NEED_CHANNEL_VAR(channel, state.channel);
- server->setUserState(user, channel, state.mute, state.deaf, state.suppress, state.prioritySpeaker, u8(state.comment));
+ server->setUserState(user, channel, state.mute, state.deaf, state.suppress, state.prioritySpeaker, u8(state.name), u8(state.comment));
cb->ice_response();
}
@@ -1423,7 +1423,7 @@ static void impl_Server_updateRegistration(const ::Murmur::AMD_Server_updateRegi
if (info.contains(ServerDB::User_Comment)) {
foreach(ServerUser *u, server->qhUsers) {
if (u->iId == id)
- server->setUserState(u, u->cChannel, u->bMute, u->bDeaf, u->bSuppress, u->bPrioritySpeaker, info.value(ServerDB::User_Comment));
+ server->setUserState(u, u->cChannel, u->bMute, u->bDeaf, u->bSuppress, u->bPrioritySpeaker, u->qsName, info.value(ServerDB::User_Comment));
}
}