From cbe63e090b0f9151734dd166ab41902cdbdf5ac0 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Tue, 24 Apr 2012 16:38:18 +0100
Subject: Don't attempt room config when dismissing the action menu as a
 non-owner in a MUC.

Resolves: #1080

diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 29bf25a..b7ac05f 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -789,7 +789,10 @@ void QtChatWindow::handleActionButtonClicked() {
 	}
 
 	QAction* result = contextMenu.exec(QCursor::pos());
-	if (result == changeSubject) {
+	if (result == NULL) {
+		/* Skip processing. Note that otherwise, because the actions could be null they could match */
+	}
+	else if (result == changeSubject) {
 		bool ok;
 		QString subject = QInputDialog::getText(this, tr("Change room subject"), tr("New subject:"), QLineEdit::Normal, subject_->text(), &ok);
 		if (ok) {
-- 
cgit v0.10.2-6-g49f6