Skip to content

Commit

Permalink
- QUICK FIX for macOS Sonoma 14.1 freezes!!!
Browse files Browse the repository at this point in the history
- disable restore of memory monitor dialog
- do not try to cleanup hidden JavaFX window
  • Loading branch information
derreisende77 committed Oct 25, 2023
1 parent 35f3d40 commit a9b8093
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/main/java/mediathek/mainwindow/MediathekGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,12 @@ protected void workaroundJavaFxInitializationBug() {

private void createMemoryMonitor() {
boolean visible = ApplicationConfiguration.getConfiguration().getBoolean(ApplicationConfiguration.MemoryMonitorDialog.VISIBLE, false);
if (visible)
showMemoryMonitorAction.showMemoryMonitor();
if (visible) {
if (!SystemUtils.IS_OS_MAC_OSX) {
//FIXME macOS Sonoma 14.1 causes freeze when showing on startup...
showMemoryMonitorAction.showMemoryMonitor();
}
}
}

/**
Expand Down Expand Up @@ -1136,7 +1140,10 @@ private void cleanupLuceneIndex() {
* Gracefully shutdown the JavaFX environment.
*/
private void shutdownJavaFx() {
JavaFxUtils.invokeInFxThreadAndWait(() -> JFXHiddenApplication.getPrimaryStage().close());
//FIXME macOS Sonoma 14.1 causes freezes here :-(
if (!SystemUtils.IS_OS_MAC_OSX)
JavaFxUtils.invokeInFxThreadAndWait(() -> JFXHiddenApplication.getPrimaryStage().close());

Platform.exit();
}

Expand Down

0 comments on commit a9b8093

Please sign in to comment.