aboutsummaryrefslogtreecommitdiff
path: root/courtroom.cpp
diff options
context:
space:
mode:
authorDavid Skoland <davidskoland@gmail.com>2017-02-10 02:13:10 +0100
committerDavid Skoland <davidskoland@gmail.com>2017-02-10 02:13:10 +0100
commitafb22c856420a255c0b3e93c89f3b7ff675287d2 (patch)
treec15834f7a4152a61879e81dc1a5f766ae1b1c464 /courtroom.cpp
parent01df52755cfad496ccc3be2f31e334234fb75cb2 (diff)
fixed an issue with emote buttons and spectator
Diffstat (limited to 'courtroom.cpp')
-rw-r--r--courtroom.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/courtroom.cpp b/courtroom.cpp
index 0d398b3c..7842977c 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -911,8 +911,6 @@ void Courtroom::handle_chatmessage_2()
QString remote_name = m_chatmessage[CHAR_NAME];
QString local_showname = ao_app->get_showname(remote_name);
- qDebug() << "local_showname: " << local_showname;
-
//empty string means we couldnt find showname in char ini
if (local_showname == "")
ui_vp_showname->setText(remote_name);
@@ -1620,11 +1618,14 @@ void Courtroom::char_clicked(int n_char)
if (!file_exists(char_ini_path))
{
qDebug() << "did not find " << char_ini_path;
- //T0D0: call error
+ call_notice("Could not find " + char_ini_path);
return;
}
- ao_app->send_server_packet(new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_real_char) + "#" + get_hdid() + "#%"));
+ if (n_real_char == m_cid)
+ enter_courtroom(m_cid);
+ else
+ ao_app->send_server_packet(new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_real_char) + "#" + get_hdid() + "#%"));
}
void Courtroom::ping_server()