2002/08/07 03:26:00

[org.ibex.core.git] / src / org / xwt / MessageQueue.java

diff --git a/src/org/xwt/MessageQueue.java b/src/org/xwt/MessageQueue.java
index b6643c6..5f8b17d 100644 (file)
--- a/src/org/xwt/MessageQueue.java
+++ b/src/org/xwt/MessageQueue.java
@@ -115,10 +115,13 @@ public class MessageQueue extends Thread {
         public MessageQueueWatcher() { start(); }
         public void run() {
             while(true) {
-                if (m != null && m == MessageQueue.currentlyPerforming) {
+                if ((m != null && m == MessageQueue.currentlyPerforming) || MessageQueue.working) {
                     Context cx;
                     String what;
-                    if (m instanceof ThreadMessage) {
+                    if (m == null) {
+                        cx = Context.getContextForThread(MessageQueue.singleton);
+                        what = "trap";
+                    } else if (m instanceof ThreadMessage) {
                         ThreadMessage tm = (ThreadMessage)m;
                         cx = Context.getContextForThread(tm);
                         what = "background thread";