From 6cabb846c5bc64e642a90d15b8ac384af5b80bc5 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 3 Dec 2002 19:42:21 +0000
Subject: [PATCH] Use a separate runnable for the AWT queue to avoid a call to
 EventQueue.isEventDispatchThread() and to make Ray happy.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2017 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/media/FrameManager.java    | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/java/com/threerings/media/FrameManager.java b/src/java/com/threerings/media/FrameManager.java
index e83e9c29f..8d752dce8 100644
--- a/src/java/com/threerings/media/FrameManager.java
+++ b/src/java/com/threerings/media/FrameManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: FrameManager.java,v 1.25 2002/12/03 19:29:35 mdb Exp $
+// $Id: FrameManager.java,v 1.26 2002/12/03 19:42:21 mdb Exp $
 
 package com.threerings.media;
 
@@ -598,21 +598,12 @@ public class FrameManager
 
     /** Used to effect periodic calls to {@link #tick}. */
     protected TimerTask _callTick = new TimerTask () {
-        public void run () {
-            if (EventQueue.isDispatchThread()) {
-                long elapsed = _timer.getElapsedMillis();
-                try {
-                    tick(elapsed);
-                } finally {
-                    clearTicking(elapsed);
-                }
-
-            } else if (testAndSet()) {
-                EventQueue.invokeLater(this);
-
-            } else {
-                // drop the frame
+        public void run ()
+        {
+            if (testAndSet()) {
+                EventQueue.invokeLater(_awtTicker);
             }
+            // else: drop the frame
         }
 
         protected final synchronized boolean testAndSet ()
@@ -643,6 +634,21 @@ public class FrameManager
             _ticking = false;
         }
 
+        /** Used to invoke the call to {@link #tick} on the AWT event
+         * queue thread. */
+        protected Runnable _awtTicker = new Runnable ()
+        {
+            public void run ()
+            {
+                long elapsed = _timer.getElapsedMillis();
+                try {
+                    tick(elapsed);
+                } finally {
+                    clearTicking(elapsed);
+                }
+            }
+        };
+
         /** Used to detect when we need to drop frames. */
         protected boolean _ticking;