2 files changed, 4 insertions, 0 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 10daa68..7e47f4d 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -335,18 +335,19 @@ void QtChatWindow::setSecurityLabelsEnabled(bool enabled) {
 	}
 }
 
 void QtChatWindow::setCorrectionEnabled(Tristate enabled) {
 	correctionEnabled_ = enabled;
 }
 
 SecurityLabelsCatalog::Item QtChatWindow::getSelectedSecurityLabel() {
 	assert(labelsWidget_->isEnabled());
+	assert(labelsWidget_->currentIndex() >= 0 && labelsWidget_->currentIndex() < availableLabels_.size());
 	return availableLabels_[labelsWidget_->currentIndex()];
 }
 
 void QtChatWindow::closeEvent(QCloseEvent* event) {
 	event->accept();
 	emit windowClosing();
 	onClosed();
 }
 
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.cpp b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
index cbda0f1..3ee0b7d 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.cpp
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
@@ -39,18 +39,21 @@ void QtOccupantListWidget::contextMenuEvent(QContextMenuEvent* event) {
 	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (contact) {
 		QMenu contextMenu;
 		std::map<QAction*, ChatWindow::OccupantAction> actions;
 		foreach (ChatWindow::OccupantAction availableAction, availableOccupantActions_) {
 			QString text = "Error: missing string";
 			switch (availableAction) {
 				case ChatWindow::Kick: text = tr("Kick user"); break;
+				case ChatWindow::MakeModerator: text = tr("Make moderator"); break;
+				case ChatWindow::MakeParticipant: text = tr("Make participant"); break;
+				case ChatWindow::MakeVisitor: text = tr("Remove voice"); break;
 			}
 			QAction* action = contextMenu.addAction(text);
 			actions[action] = availableAction;
 		}
 		QAction* result = contextMenu.exec(event->globalPos());
 		if (result) {
 			onOccupantActionSelected(actions[result], contact);
 		}
 	}