From f78657957a757c07b5a255ea0af4f2e733690fda Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Wed, 27 May 2020 10:33:22 +0200
Subject: [PATCH] fix emotes if canonical alias is null

---
 lib/src/room.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/room.dart b/lib/src/room.dart
index 4a4612e..044208e 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -592,7 +592,7 @@ class Room {
             final event = room.getState('im.ponies.room_emotes', stateKey);
             if (event != null && stateKeyEntry.value is Map) {
               addEmotePack(
-                  room.canonicalAlias.isEmpty ? room.id : canonicalAlias,
+                  (room.canonicalAlias?.isEmpty ?? true) ? room.id : canonicalAlias,
                   event.content,
                   stateKeyEntry.value['name']);
             }