summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-12-08 08:55:19 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2016-12-09 08:15:44 (GMT)
commitda7162b6e80ed6ce802bece3891fe85f30770c56 (patch)
tree11cffaa17e475a0854b0726bdb4d4f126632dbe9 /Swift/resources/icons/create_connecting_icon.sh
parentc65a90e2a73814d09ad8c60adc4a259e90006db7 (diff)
downloadswift-da7162b6e80ed6ce802bece3891fe85f30770c56.zip
swift-da7162b6e80ed6ce802bece3891fe85f30770c56.tar.bz2
Fix issue with invites to MUC if a MUC PM for that room is open
Previously if you wanted to invite people to a MUC and had a PM window for a MUC occupant open at the same time, the InviteToMUCUIEvent would be handled by the PM window, by the ChatController of the PM window and not the MUCController of the MUC window. Test-Information: Verified that some scenarios work correctly: - Tested a drop to a MUC window while a MUC PM window is open to an occupant in the MUC. Previously this crashed due to ChatsManager::localMUCServiceJID_ being empty. - Test that impromptu MUC creation to a normal chat works. - Test that impromptu MUC creation to a MUC PM chat works. All unit and integration tests pass on macOS 10.12.1. Change-Id: Ib20de7e925e3503308211936ee47d4ba829d0394
Diffstat (limited to 'Swift/resources/icons/create_connecting_icon.sh')
0 files changed, 0 insertions, 0 deletions