Skip to content
Permalink
Browse files

Include actor when performing a user rename

  • Loading branch information...
bontibon authored and mkrautz committed Nov 19, 2015
1 parent bbd93e1 commit 07a142d1b8bb6aa2823179b3b89b41a5c914a87b
Showing with 8 additions and 2 deletions.
  1. +7 −2 src/mumble/Messages.cpp
  2. +1 −0 src/murmur/Messages.cpp
@@ -534,8 +534,13 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
QString newName = u8(msg.name());
pmModel->renameUser(pDst, newName);
if (! oldName.isNull() && oldName != newName) {
g.l->log(Log::UserRenamed, tr("%1 renamed to %2.").arg(Log::formatClientUser(pDst, Log::Target, oldName),
Log::formatClientUser(pDst, Log::Target)));
if (pSrc != pDst) {
g.l->log(Log::UserRenamed, tr("%1 renamed to %2 by %3.").arg(Log::formatClientUser(pDst, Log::Target, oldName))
.arg(Log::formatClientUser(pDst, Log::Target)).arg(Log::formatClientUser(pSrc, Log::Source)));
} else {
g.l->log(Log::UserRenamed, tr("%1 renamed to %2.").arg(Log::formatClientUser(pDst, Log::Target, oldName),
Log::formatClientUser(pDst, Log::Target)));
}
}
}
if (msg.has_texture_hash()) {
@@ -1512,6 +1512,7 @@ void Server::msgUserList(ServerUser *uSource, MumbleProto::UserList &msg) {
}
}
if (mpus.has_session()) {
mpus.set_actor(uSource->uiSession);
mpus.set_name(u8(name));
sendAll(mpus);
}

0 comments on commit 07a142d

Please sign in to comment.
You can’t perform that action at this time.