From 6eab62a3bd24879f11c62c214a87b9fc256c7318 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 14 Oct 2010 17:46:58 +0000
Subject: [PATCH] This logic is twisty.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1024 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/java/com/threerings/chat/SubtitleChatOverlay.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/com/threerings/chat/SubtitleChatOverlay.java b/src/java/com/threerings/chat/SubtitleChatOverlay.java
index 74a5bc1d..922cbdac 100644
--- a/src/java/com/threerings/chat/SubtitleChatOverlay.java
+++ b/src/java/com/threerings/chat/SubtitleChatOverlay.java
@@ -727,10 +727,14 @@ public class SubtitleChatOverlay extends ChatOverlay
 
         } else if (message instanceof UserMessage) {
             int type = _logic.decodeType(localtype);
-            // factor in the mode
             if (type != 0) {
+                // factor in the mode
                 type = _logic.adjustTypeByMode(((UserMessage) message).mode, type);
+                if (type != 0) {
+                    return type;
+                }
             }
+
             // if we're showing from history, include specialized chat messages
             if (history) {
                 return ChatLogic.SPECIALIZED;