From fe3516b044b5c727ec8d2e0445515de2ff3a41c7 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Mon, 7 Aug 2023 22:47:23 +0200
Subject: [PATCH] Explicitely set room for EmojiPicker

---
 src/qml/Component/Emoji/EmojiPicker.qml | 1 +
 src/qml/Dialog/EmojiDialog.qml          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/qml/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml
index 9f177096e..39060520e 100644
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -17,6 +17,7 @@ ColumnLayout {
 
     property bool includeCustom: false
     property bool showQuickReaction: false
+    property NeoChatRoom currentRoom
 
     readonly property var currentEmojiModel: {
         if (includeCustom) {
diff --git a/src/qml/Dialog/EmojiDialog.qml b/src/qml/Dialog/EmojiDialog.qml
index 195d7bce4..64db15bc2 100644
--- a/src/qml/Dialog/EmojiDialog.qml
+++ b/src/qml/Dialog/EmojiDialog.qml
@@ -60,6 +60,7 @@ QQC2.Popup {
         currentRoom: root.currentRoom
         includeCustom: emojiPopup.includeCustom
         showQuickReaction: emojiPopup.showQuickReaction
+        currentRoom: RoomManager.currentRoom
         onChosen: {
             emojiPopup.chosen(emoji)
             if (emojiPopup.closeOnChosen) emojiPopup.close()