diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp
index 5fae89045..7329bf86b 100644
--- a/src/citra_qt/multiplayer/chat_room.cpp
+++ b/src/citra_qt/multiplayer/chat_room.cpp
@@ -459,12 +459,15 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) {
});
}
- if (has_mod_perms && nickname != cur_nickname) { // You can't kick or ban yourself
+ if (nickname != cur_nickname) { // You can't kick or ban yourself
context_menu.addSeparator();
QAction* kick_action = context_menu.addAction(tr("Kick"));
QAction* ban_action = context_menu.addAction(tr("Ban"));
+ kick_action->setEnabled(has_mod_perms);
+ ban_action->setEnabled(has_mod_perms);
+
connect(kick_action, &QAction::triggered, [this, nickname] {
QMessageBox::StandardButton result =
QMessageBox::question(this, tr("Kick Player"),
diff --git a/src/citra_qt/multiplayer/client_room.cpp b/src/citra_qt/multiplayer/client_room.cpp
index 312090cbe..1806b0511 100644
--- a/src/citra_qt/multiplayer/client_room.cpp
+++ b/src/citra_qt/multiplayer/client_room.cpp
@@ -47,8 +47,6 @@ ClientRoomWindow::ClientRoomWindow(QWidget* parent)
ModerationDialog dialog(this);
dialog.exec();
});
- ui->moderation->setDefault(false);
- ui->moderation->setAutoDefault(false);
connect(ui->chat, &ChatRoom::UserPinged, this, &ClientRoomWindow::ShowNotification);
UpdateView();
}
@@ -57,9 +55,7 @@ ClientRoomWindow::~ClientRoomWindow() = default;
void ClientRoomWindow::SetModPerms(bool is_mod) {
ui->chat->SetModPerms(is_mod);
- ui->moderation->setVisible(is_mod);
- ui->moderation->setDefault(false);
- ui->moderation->setAutoDefault(false);
+ ui->moderation->setEnabled(is_mod);
}
void ClientRoomWindow::RetranslateUi() {
diff --git a/src/citra_qt/multiplayer/client_room.ui b/src/citra_qt/multiplayer/client_room.ui
index 97e88b502..76118d6e4 100644
--- a/src/citra_qt/multiplayer/client_room.ui
+++ b/src/citra_qt/multiplayer/client_room.ui
@@ -47,7 +47,7 @@
Moderation...
- false
+ true