X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTApplication.java;h=34f1559007090b31eef65a4d79be9288ed54dec7;hb=5255f69c14d2c19f0e2f1f4ae8d9a106c92d3b8c;hp=ee2e9de86664a04a238070b40637dff35a393176;hpb=4297b49b4f9f66a75d98c0d5e326a471e94cf404;p=nikiroo-utils.git

diff --git a/src/jexer/TApplication.java b/src/jexer/TApplication.java
index ee2e9de..34f1559 100644
--- a/src/jexer/TApplication.java
+++ b/src/jexer/TApplication.java
@@ -1125,8 +1125,14 @@ public class TApplication implements Runnable {
         }
 
         secondaryEventReceiver.handleEvent(event);
-        if (doubleClick != null) {
-            secondaryEventReceiver.handleEvent(doubleClick);
+        // Note that it is possible for secondaryEventReceiver to be null
+        // now, because its handleEvent() might have finished out on the
+        // secondary thread.  So put any extra processing inside a null
+        // check.
+        if (secondaryEventReceiver != null) {
+            if (doubleClick != null) {
+                secondaryEventReceiver.handleEvent(doubleClick);
+            }
         }
     }