aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/aocaseannouncerdialog.cpp2
-rw-r--r--src/aooptionsdialog.cpp2
-rw-r--r--src/charselect.cpp2
-rw-r--r--src/courtroom.cpp3
-rw-r--r--src/packet_distribution.cpp2
5 files changed, 5 insertions, 6 deletions
diff --git a/src/aocaseannouncerdialog.cpp b/src/aocaseannouncerdialog.cpp
index d91433a..aea6405 100644
--- a/src/aocaseannouncerdialog.cpp
+++ b/src/aocaseannouncerdialog.cpp
@@ -3,7 +3,7 @@
AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent,
AOApplication *p_ao_app,
Courtroom *p_court)
- : QDialog(parent)
+ : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
{
ao_app = p_ao_app;
court = p_court;
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 4d36f43..2641d8d 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -3,7 +3,7 @@
#include "bass.h"
AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
- : QDialog(parent)
+ : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
{
ao_app = p_ao_app;
diff --git a/src/charselect.cpp b/src/charselect.cpp
index b543934..f8c622d 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -148,8 +148,6 @@ void Courtroom::char_clicked(int n_char)
else
update_character(n_char);
- enter_courtroom();
-
if (n_char != -1)
ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
}
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index ec4e47b..baa6631 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -720,8 +720,7 @@ void Courtroom::set_widgets()
ui_sfx_remove->setText("X");
ui_sfx_remove->set_image("evidencex");
ui_sfx_remove->setToolTip(
- tr("Remove the currently selected iniswap from the list and return to "
- "the original character folder."));
+ tr("Remove the currently selected sound effect."));
ui_sfx_remove->hide();
set_iniswap_dropdown();
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index f712579..1ffbcaf 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -460,6 +460,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (f_contents.size() < 3)
goto end;
+ w_courtroom->enter_courtroom();
+
if (courtroom_constructed)
w_courtroom->update_character(f_contents.at(2).toInt());
}