From 1502a1859336e92a2c92e960475f2c5fa1ed3f3f Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Mon, 9 Nov 2020 15:05:21 -0600
Subject: [PATCH] Reformat emote_mod logic (#307)

Interjections should not force preanimation if 'Pre' is unchecked.
---
 src/courtroom.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 35c2eac..e27603b 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1596,13 +1596,11 @@ void Courtroom::on_chat_return_pressed()
   int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
 
   // needed or else legacy won't understand what we're saying
-  if (objection_state > 0) {
-    if (ui_pre->isChecked()) {
-      if (f_emote_mod == 4 || f_emote_mod == 5)
-        f_emote_mod = 6;
-      else
-        f_emote_mod = 2;
-    }
+  if (objection_state > 0 && ui_pre->isChecked()) {
+    if (f_emote_mod == 4 || f_emote_mod == 5)
+      f_emote_mod = 6;
+    else
+      f_emote_mod = 2;
   }
   else if (ui_pre->isChecked() && !ui_pre_non_interrupt->isChecked()) {
     if (f_emote_mod == 0)