From 6398d8947f567d42a22397a12c7c49c7ab203bb7 Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Thu, 15 Jun 2017 17:22:40 +0300
Subject: [PATCH] JavaFX: Log uncaught exceptions in SceneBuilder, use
 per-thread uncaught exception handler (IDEA-161991)

---
 .../plugins/javaFX/sceneBuilder/SceneBuilderImpl.java         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
index 5da11e57d291..f1fcd76f53c0 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
@@ -105,9 +105,7 @@ public class SceneBuilderImpl implements SceneBuilder {
     if (myProject.isDisposed()) {
       return;
     }
-    if (Thread.getDefaultUncaughtExceptionHandler() == null) {
-      Thread.setDefaultUncaughtExceptionHandler(SceneBuilderImpl::logUncaughtException);
-    }
+    Thread.currentThread().setUncaughtExceptionHandler(SceneBuilderImpl::logUncaughtException);
 
     myEditorController = new EditorController();
     updateCustomLibrary();