0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2025-04-18 10:13:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Guard against nested event loop exceptions

Browse source
This commit is contained in:
crschnick 2025-03-20 12:15:12 +00:00
parent d4a713f29b
commit 8c51eac399
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/xpipe/app/core/window/AppDialog.java
View file

@ -84,7 +84,7 @@ public class AppDialog {
var transition = new PauseTransition(Duration.millis(200));
transition.setOnFinished(e -> {
if (wait) {
Platform.exitNestedEventLoop(key, null);
PlatformThread.exitNestedEventLoop(key);
}
});
transition.play();
@ -95,7 +95,7 @@ public class AppDialog {
}
});
if (wait) {
Platform.enterNestedEventLoop(key);
PlatformThread.enterNestedEventLoop(key);
waitForDialogClose(o);
}
}

23
app/src/main/java/io/xpipe/app/util/PlatformThread.java
View file

@ -274,6 +274,25 @@ public class PlatformThread {
return true;
}
public static void enterNestedEventLoop(Object key) {
try {
Platform.enterNestedEventLoop(key);
} catch (IllegalStateException ex) {
// We might be in an animation or layout call
ErrorEvent.fromThrowable(ex).omit().expected().handle();
}
}
public static void exitNestedEventLoop(Object key) {
try {
Platform.exitNestedEventLoop(key, null);
} catch (IllegalArgumentException ex) {
// The event loop might have died somehow
// Or we passed an invalid key
ErrorEvent.fromThrowable(ex).omit().expected().handle();
}
}
public static void runNestedLoopIteration() {
if (!Platform.canStartNestedEventLoop()) {
return;
@ -281,9 +300,9 @@ public class PlatformThread {
var key = new Object();
Platform.runLater(() -> {
Platform.exitNestedEventLoop(key, null);
exitNestedEventLoop(key);
});
Platform.enterNestedEventLoop(key);
enterNestedEventLoop(key);
}
public static void runLaterIfNeeded(Runnable r) {