Be more aggressive about reporting FX UI thread violations.

vinumeris · Dec 16, 2014 · 7a46ec5 · 7a46ec5
1 parent 80a868d
commit 7a46ec5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/client/src/main/java/lighthouse/utils/GuiUtils.java b/client/src/main/java/lighthouse/utils/GuiUtils.java
@@ -3,6 +3,7 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.sun.prism.GraphicsPipeline;
 import com.sun.prism.sw.SWPipeline;
+import com.vinumeris.crashfx.CrashWindow;
 import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
@@ -44,7 +45,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
-import static com.google.common.base.Preconditions.checkState;
 import static lighthouse.protocol.LHUtils.unchecked;
 
 public class GuiUtils {
@@ -248,7 +248,13 @@ public static void brightnessUnadjust(Node node) {
     }
 
     public static void checkGuiThread() {
-        checkState(Platform.isFxApplicationThread());
+        if (!Platform.isFxApplicationThread()) {
+            // Don't just throw directly here to avoid missing the problem when buggy code swallows the exceptions.
+            IllegalStateException ex = new IllegalStateException();
+            log.error("Threading violation: not on FX UI thread", ex);
+            CrashWindow.open(ex);
+            throw ex;
+        }
     }
 
     public static BooleanBinding conjunction(List<BooleanProperty> list) {