Skip to content
Permalink
Browse files

Don't display "Welcome message: " in client if none was sent.

Fixes #1675
  • Loading branch information...
bontibon authored and mkrautz committed May 20, 2015
1 parent 4c16f25 commit 2612b67de1603aca32d0fc047997a62273aa94be
Showing with 12 additions and 3 deletions.
  1. +12 −3 src/mumble/Messages.cpp
@@ -121,7 +121,12 @@ void MainWindow::msgServerSync(const MumbleProto::ServerSync &msg) {
g.uiSession = msg.session();
g.pPermissions = ChanACL::Permissions(static_cast<unsigned int>(msg.permissions()));
g.l->clearIgnore();
g.l->log(Log::Information, tr("Welcome message: %1").arg(u8(msg.welcome_text())));
if (msg.has_welcome_text()) {
QString str = u8(msg.welcome_text());
if (!str.isEmpty()) {
g.l->log(Log::Information, tr("Welcome message: %1").arg(str));
}
}
pmModel->ensureSelfVisible();
pmModel->recheckLinks();

@@ -171,8 +176,12 @@ void MainWindow::msgServerSync(const MumbleProto::ServerSync &msg) {


void MainWindow::msgServerConfig(const MumbleProto::ServerConfig &msg) {
if (msg.has_welcome_text())
g.l->log(Log::Information, tr("Welcome message: %1").arg(u8(msg.welcome_text())));
if (msg.has_welcome_text()) {
QString str = u8(msg.welcome_text());
if (!str.isEmpty()) {
g.l->log(Log::Information, tr("Welcome message: %1").arg(str));
}
}
if (msg.has_max_bandwidth())
AudioInput::setMaxBandwidth(msg.max_bandwidth());
if (msg.has_allow_html())

0 comments on commit 2612b67

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