Skip to content

Commit

Permalink
Window decorations: do not exit application with `UnsatisfiedLinkErro…
Browse files Browse the repository at this point in the history
…r` in case that FlatLaf DLL cannot be executed because of restrictions on temporary directory (issue #436)
  • Loading branch information
DevCharly committed Dec 6, 2021
1 parent e1bfabb commit 47a1122
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FlatLaf Change Log

#### Fixed bugs

- Linux: Fixed font problems when running on Oracle Java 8 (OpenJDK 8 is not
- Linux: Fixed font problems when running on Oracle Java (OpenJDK is not
affected):
- oversized text if system font is "Inter" (issue #427)
- missing text if system font is "Cantarell" (on Fedora)
Expand All @@ -14,6 +14,10 @@ FlatLaf Change Log
on AWT thread. (issue #432)
- macOS: Fixed `NullPointerException` when using AWT component
`java.awt.Choice`. (issue #439)
- Native window decorations: Do not exit application with `UnsatisfiedLinkError`
in case that FlatLaf DLL cannot be executed because of restrictions on
temporary directory. Instead, continue with default window decorations. (issue
#436)

## 1.6.4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,18 @@ private void install( Window window ) {
return;

// install
WndProc wndProc = new WndProc( window );
if( wndProc.hwnd == 0 )
return;
try {
WndProc wndProc = new WndProc( window );
if( wndProc.hwnd == 0 )
return;

windowsMap.put( window, wndProc );
windowsMap.put( window, wndProc );
} catch( UnsatisfiedLinkError ex ) {
// catch for the case that the operating system prevents execution of DLL
// (e.g. if DLLs in temp folder are restricted)
// --> continue application without custom decorations
LoggingFacade.INSTANCE.logSevere( null, ex );
}
}

private void uninstall( Window window ) {
Expand Down

0 comments on commit 47a1122

Please sign in to comment.