Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from AttorneyOnline/master

Browse Source 
bring up to date with master
This commit is contained in:
in1tiate 2020-03-08 05:38:24 -05:00 committed by GitHub
commit 5f69d4e649
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/courtroom.cpp
View File

@ -1655,7 +1655,21 @@ void Courtroom::handle_chatmessage_2()
ui_vp_chatbox->set_image("chatmed.png"); ui_vp_chatbox->set_image("chatmed.png");
else else
{ {
QString chatbox_path = ao_app->get_base_path() + "misc/" + chatbox + "/chatbox.png"; QString chatbox_path;
QString misc_path = ao_app->get_base_path() + "misc/" + chatbox + "/chatbox.png";
// support for 2.4 legacy chatboxes
QString legacy_path = ao_app->get_base_path() + "misc/" + chatbox + ".png";
if (file_exists(misc_path))
{
chatbox_path = misc_path;
}
else if (file_exists(legacy_path))
chatbox_path = legacy_path;
else
{
QString default_chatbox_path = ao_app->get_theme_path("chatmed.png");
chatbox_path = default_chatbox_path;
}
ui_vp_chatbox->set_image_from_path(chatbox_path); ui_vp_chatbox->set_image_from_path(chatbox_path);
} }