anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix runtime critical when room has no name

Browse source
This commit is contained in:
fiaxh 2020-10-29 19:11:55 +01:00
parent 7571edfb5a
commit 57ab387060
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/src/ui/util/helper.vala
View file

@ -161,7 +161,7 @@ private static string? get_real_display_name(StreamInteractor stream_interactor,
private static string get_groupchat_display_name(StreamInteractor stream_interactor, Account account, Jid jid) { private static string get_groupchat_display_name(StreamInteractor stream_interactor, Account account, Jid jid) {
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY); MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
string room_name = muc_manager.get_room_name(account, jid); string? room_name = muc_manager.get_room_name(account, jid);
if (room_name != null && room_name != jid.localpart) { if (room_name != null && room_name != jid.localpart) {
return room_name; return room_name;
} }

2
xmpp-vala/src/module/xep/0045_muc/module.vala
View file

@ -383,7 +383,7 @@ public class Module : XmppStreamModule {
if (query_result != null) { if (query_result != null) {
foreach (ServiceDiscovery.Identity identity in query_result.identities) { foreach (ServiceDiscovery.Identity identity in query_result.identities) {
if (identity.category == "conference") { if (identity.category == "conference" && identity.name != null) {
stream.get_flag(Flag.IDENTITY).set_room_name(jid, identity.name); stream.get_flag(Flag.IDENTITY).set_room_name(jid, identity.name);
room_name_set(stream, jid, identity.name); room_name_set(stream, jid, identity.name);
} }