From 5b2683dfa5241777d621866e4e0a0790766433c2 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Mon, 6 Apr 2020 15:33:43 +0200
Subject: Last message correction fixes

---
 main/src/ui/conversation_view_controller.vala | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'main')

diff --git a/main/src/ui/conversation_view_controller.vala b/main/src/ui/conversation_view_controller.vala
index 31c7e612..dce9920e 100644
--- a/main/src/ui/conversation_view_controller.vala
+++ b/main/src/ui/conversation_view_controller.vala
@@ -151,6 +151,10 @@ public class ConversationViewController : Object {
     }
 
     private bool forward_key_press_to_chat_input(EventKey event) {
+        if (((Gtk.Window)view.get_toplevel()).get_focus() is TextView) {
+            return false;
+        }
+
         // Don't forward / change focus on Control / Alt
         if (event.keyval == Gdk.Key.Control_L || event.keyval == Gdk.Key.Control_R ||
                 event.keyval == Gdk.Key.Alt_L || event.keyval == Gdk.Key.Alt_R) {
-- 
cgit v1.2.3-70-g09d2