Skip to content

Commit

Permalink
Merge PR #3684: Set temporary, position, and description in GRPC Chan…
Browse files Browse the repository at this point in the history
…nelAdd
  • Loading branch information
davidebeatrici committed May 3, 2019
2 parents 0f39a12 + 38a9960 commit 0e71f79
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/murmur/MurmurGRPCImpl.cpp
Expand Up @@ -1506,16 +1506,21 @@ void V1_ChannelAdd::impl(bool) {


{ {
QWriteLocker wl(&server->qrwlVoiceThread); QWriteLocker wl(&server->qrwlVoiceThread);
nc = server->addChannel(parent, qsName); nc = server->addChannel(parent, qsName, request.temporary(), request.position());
} }


nc->qsDesc = u8(request.description());

server->updateChannel(nc); server->updateChannel(nc);
int newid = nc->iId; int newid = nc->iId;


::MumbleProto::ChannelState mpcs; ::MumbleProto::ChannelState mpcs;
mpcs.set_channel_id(newid); mpcs.set_channel_id(newid);
mpcs.set_parent(parent->iId); mpcs.set_parent(parent->iId);
mpcs.set_name(request.name()); mpcs.set_name(request.name());
mpcs.set_temporary(request.temporary());
mpcs.set_position(request.position());
mpcs.set_description(request.description());
server->sendAll(mpcs); server->sendAll(mpcs);


::MurmurRPC::Channel resChannel; ::MurmurRPC::Channel resChannel;
Expand Down

0 comments on commit 0e71f79

Please sign in to comment.