From d8d7a5348c4f444f4452ebaa42a103b63dfc739d Mon Sep 17 00:00:00 2001
From: Paul Fariello <paul@fariello.eu>
Date: Fri, 22 Feb 2019 19:56:12 +0140
Subject: [PATCH] Ensure OMEMO isn't started before starting OTR

---
 src/command/cmd_funcs.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 08aa88df..ab5243c1 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -7308,6 +7308,11 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args)
             return TRUE;
         }
 
+        if (chatwin->is_omemo) {
+            win_println(window, THEME_DEFAULT, '!', "You must disable OMEMO before starting an OTR session.");
+            return TRUE;
+        }
+
         if (chatwin->is_otr) {
             win_println(window, THEME_DEFAULT, '!', "You are already in an OTR session.");
             return TRUE;