From 6bae8b556ca7bbe56e3fa53b881bb5d1c78528cc Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Fri, 27 Jun 2014 16:29:53 -0500
Subject: [PATCH] Omaha #3323 fixed collaboration disposed font issue

Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: c2cd9912961a7b07ad51b565dfb701f82532f61c [formerly 023d1bde0b5eac17a8fd92b56f8b8fac735cc504] [formerly dc7a76197d3a68d72948af2419d1a8ab4b699379] [formerly fe149faffaee0a848b9c1282c1c8f02b6375bc9a [formerly dc7a76197d3a68d72948af2419d1a8ab4b699379 [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]
Former-commit-id: fe149faffaee0a848b9c1282c1c8f02b6375bc9a
Former-commit-id: 54898f3b2d36260900cf96d8c93cda806a155e01 [formerly cb108f12b83326d6ba71d2f8e608d6a4ba07a2bd]
Former-commit-id: b8dc75d192608bcc1a7c8f1c754be46cafcd2075
---
 .../viz/collaboration/ui/session/AbstractSessionView.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/AbstractSessionView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/AbstractSessionView.java
index 1d08c131f1..f7e2c95fd5 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/AbstractSessionView.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/AbstractSessionView.java
@@ -92,6 +92,7 @@ import com.raytheon.viz.ui.views.CaveFloatingView;
  *                                     running in an asynchronous thread.
  * Mar 11, 2014 #2865      lvenable    Added null checks for msgArchive.
  * Jun 20, 2014 3281       bclement    made sendErrorMessage() public
+ * Jun 27, 2014 3323       bclement    fixed disposed font issue
  * </pre>
  * 
  * @author rferrel
@@ -572,11 +573,12 @@ public abstract class AbstractSessionView<T extends IUser> extends
 
     @Subscribe
     public void changeFont(FontData data) {
-        if (messagesTextFont != null) {
-            messagesTextFont.dispose();
-        }
+        Font oldFont = messagesTextFont;
         messagesTextFont = new Font(Display.getCurrent(), data);
         messagesText.setFont(messagesTextFont);
+        if (oldFont != null) {
+            oldFont.dispose();
+        }
     }
 
     public void setAlertWords(List<AlertWord> words) {