Skip to content

Fix Intel crash in ThemeManager on macOS #13543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
- When creating a library, if you drag a PDF file containing only a single column, the dialog will now automatically close. [#13262](https://github.com/JabRef/jabref/issues/13262)
- We fixed an issue where the tab showing the fulltext search results would appear blank after switching library. [#13241](https://github.com/JabRef/jabref/issues/13241)
- Enhanced field selection logic in the Merge Entries dialog when fetching from DOI to prefer valid years and entry types. [#12549](https://github.com/JabRef/jabref/issues/12549)
- We fixed an issue where JabRef crashed on startup on Apple Silicon Macs due to native library compatibility issues in the theme manager. [#13536](https://github.com/JabRef/jabref/issues/13536)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need; feature was introduced after the last release


### Removed

Expand Down
16 changes: 14 additions & 2 deletions jabgui/src/main/java/org/jabref/gui/theme/ThemeManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@ public ThemeManager(WorkspacePreferences workspacePreferences,
this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
this.updateRunner = Objects.requireNonNull(updateRunner);
this.themeWindowManager = ThemeWindowManagerFactory.create();
ThemeWindowManager tempThemeWindowManager = null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not use "temp" prefix in JabRef. Do without.

With "this." you have the different scoping.

Maybe do without local variable and in the catch block set to null?

try {
tempThemeWindowManager = ThemeWindowManagerFactory.create();
} catch (UnsatisfiedLinkError | RuntimeException e) {
LOGGER.error("Failed to create ThemeWindowManager (likely due to native library compatibility issues on ARM64)", e);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do debug instead of warn

It's Intel and not ARM

}
this.themeWindowManager = tempThemeWindowManager;

this.baseStyleSheet = StyleSheet.create(Theme.BASE_CSS).get();
this.theme = workspacePreferences.getTheme();
Expand Down Expand Up @@ -121,7 +127,13 @@ private void applyDarkModeToWindow(Stage stage, boolean darkMode) {
return;
}

themeWindowManager.setDarkModeForWindowFrame(stage, darkMode);
if (themeWindowManager != null) {
try {
themeWindowManager.setDarkModeForWindowFrame(stage, darkMode);
} catch (UnsatisfiedLinkError | RuntimeException e) {
LOGGER.error("Failed to set dark mode for window frame (likely due to native library compatibility issues on ARM64)", e);
}
}
LOGGER.debug("Applied {} mode to window: {}", darkMode ? "dark" : "light", stage);
}

Expand Down