Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-04-24 15:38:18 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-04-24 15:38:18 (GMT) |
| commit | cbe63e090b0f9151734dd166ab41902cdbdf5ac0 (patch) | |
| tree | 7529ef0c31d7ef89d78e1e57bd93fd2ffbf97ec5 /Swift/QtUI | |
| parent | b297ad414d4a3eb84f831783a1273cc9d7e2a101 (diff) | |
| download | swift-cbe63e090b0f9151734dd166ab41902cdbdf5ac0.zip swift-cbe63e090b0f9151734dd166ab41902cdbdf5ac0.tar.bz2 | |
Don't attempt room config when dismissing the action menu as a non-owner in a MUC.
Resolves: #1080
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |