diff options
Diffstat (limited to 'courtroom.cpp')
| -rw-r--r-- | courtroom.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/courtroom.cpp b/courtroom.cpp index a15e4394..717a13c3 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -95,6 +95,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_ooc_chat_name = new QLineEdit(this); ui_ooc_chat_name->setFrame(false); ui_ooc_chat_name->setPlaceholderText("Name"); + ui_ooc_chat_name->setText(ao_app->get_ooc_name()); //ui_area_password = new QLineEdit(this); //ui_area_password->setFrame(false); @@ -649,13 +650,15 @@ void Courtroom::enter_courtroom(int p_cid) if (m_cid == -1) { - ao_app->discord->state_spectate(); + if(ao_app->is_discord_enabled()) + ao_app->discord->state_spectate(); f_char = ""; } else { f_char = ao_app->get_char_name(char_list.at(m_cid).name); - ao_app->discord->state_character(f_char.toStdString()); + if(ao_app->is_discord_enabled()) + ao_app->discord->state_character(f_char.toStdString()); } current_char = f_char; |