aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2020-10-29 19:11:55 +0100
committerfiaxh <git@lightrise.org>2020-10-29 19:11:55 +0100
commitdba63b14737d9415bb189235065efb80676e2b17 (patch)
tree879901cdd0b9f7c348c1c087a3b5d6fe9b8d52c5
parentb685c7ab9e9b7ee4551f49a7e50083f968f64245 (diff)
downloaddino-dba63b14737d9415bb189235065efb80676e2b17.tar.gz
dino-dba63b14737d9415bb189235065efb80676e2b17.zip
Fix runtime critical when room has no name
-rw-r--r--main/src/ui/util/helper.vala2
-rw-r--r--xmpp-vala/src/module/xep/0045_muc/module.vala2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
index de4896d9..5d6d7bf5 100644
--- a/main/src/ui/util/helper.vala
+++ b/main/src/ui/util/helper.vala
@@ -162,7 +162,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) {
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) {
return room_name;
}
diff --git a/xmpp-vala/src/module/xep/0045_muc/module.vala b/xmpp-vala/src/module/xep/0045_muc/module.vala
index e9da6657..aef3796b 100644
--- a/xmpp-vala/src/module/xep/0045_muc/module.vala
+++ b/xmpp-vala/src/module/xep/0045_muc/module.vala
@@ -407,7 +407,7 @@ public class Module : XmppStreamModule {
Gee.List<Feature> features = new ArrayList<Feature>();
foreach (ServiceDiscovery.Identity identity in info_result.identities) {
- if (identity.category == "conference") {
+ if (identity.category == "conference" && identity.name != null) {
stream.get_flag(Flag.IDENTITY).set_room_name(jid, identity.name);
}
}