Move cur paragraph logic to earlier

ButterscotchV · Jan 29, 2024 · 6accf1f · 6accf1f
1 parent 65ea17e
commit 6accf1f
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/ButterSTT/MessageSystem/MessageQueue.cs b/ButterSTT/MessageSystem/MessageQueue.cs
@@ -75,6 +75,22 @@ public string GetCurrentMessage()
                 }
             }
 
+            // If there's no queue and there's new words to display
+            if (WordQueue.Count <= 0 && CurParagraph.Length > 0)
+            {
+                // Fit the whole current paragraph in the message if possible
+                if (CurParagraph.Length <= MessageLength - CurMessageLength)
+                {
+                    return string.Concat(
+                            string.Concat(MessageWordQueue.Select(w => w.Text)),
+                            string.Concat(
+                                CurParagraph.Sentences.SelectMany(x => x.Words, (x, y) => y.Text)
+                            )
+                        )
+                        .Trim();
+                }
+            }
+
             // Make sure there is enough room to fit a new word in the message and
             // allow space for a dash after the current text if there is already more
             while (
@@ -94,22 +110,6 @@ public string GetCurrentMessage()
                 CurMessageLength += word.Length;
             }
 
-            // If there's no queue and there's new words to display
-            if (WordQueue.Count <= 0 && CurParagraph.Length > 0)
-            {
-                // Fit the whole current paragraph in the message if possible
-                if (CurParagraph.Length <= MessageLength - CurMessageLength)
-                {
-                    return string.Concat(
-                            string.Concat(MessageWordQueue.Select(w => w.Text)),
-                            string.Concat(
-                                CurParagraph.Sentences.SelectMany(x => x.Words, (x, y) => y.Text)
-                            )
-                        )
-                        .Trim();
-                }
-            }
-
             var message = string.Concat(MessageWordQueue.Select(w => w.Text)).Trim();
             return $"{message}{(WordQueue.Count > 0 ? "-" : "")}";
         }